Attachment 49780 Details for Bug 116778

[patch] Patch to fix input method plugin issue in qt-4.0.1.

qt-4.0.1-imsw-multi.diff (text/plain), 2.08 KB, created by Zhe Su on 2005-09-13 14:54:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zhe Su

Created: 2005-09-13 14:54:12 UTC

Size: 2.08 KB

patch

obsolete

>--- src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp.old	2005-09-13 20:17:03.000000000 +0800
>+++ src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp	2005-09-13 20:17:38.000000000 +0800
>@@ -45,7 +45,7 @@
> #include <stdlib.h>
> 
> QMultiInputContext::QMultiInputContext()
>-    : QInputContext(), fw(0), current(-1)
>+    : QInputContext(),  current(-1)
> {
>     QStringList keys = QInputContextFactory::keys();
>     for (int i = keys.size()-1; i >= 0; --i)
>@@ -133,16 +133,11 @@
> 
> void QMultiInputContext::setFocusWidget(QWidget *w)
> {
>-    fw = w;
>+    QInputContext::setFocusWidget(w);
>     if (slave())
> 	slave()->setFocusWidget(w);
> }
> 
>-QWidget *QMultiInputContext::focusWidget() const
>-{
>-    return fw;
>-}
>-
> void QMultiInputContext::widgetDestroyed(QWidget *w)
> {
>     if (slave())
>--- src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h.old	2005-09-13 20:17:08.000000000 +0800
>+++ src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h	2005-09-13 20:18:36.000000000 +0800
>@@ -71,7 +71,6 @@
> 
>     QList<QAction *> actions();
> 
>-    QWidget *focusWidget() const;
>     void setFocusWidget(QWidget *w);
> 
>     void widgetDestroyed( QWidget *w );
>@@ -82,7 +81,6 @@
> protected slots:
>     void changeSlave(QAction *);
> private:
>-    QWidget *fw;
>     int current;
>     QList<QInputContext *> slaves;
>     QMenu *menu;
>--- src/plugins/inputmethods/imsw-multi/imsw-multi.pro.old	2005-09-13 22:31:23.000000000 +0800
>+++ src/plugins/inputmethods/imsw-multi/imsw-multi.pro	2005-09-13 22:31:43.000000000 +0800
>@@ -10,5 +10,5 @@
> SOURCES += qmultiinputcontext.cpp \
>            qmultiinputcontextplugin.cpp
> 
>-target.path += $$plugins.path/inputmethods
>+target.path += $$[QT_INSTALL_PLUGINS]/inputmethods
> INSTALLS    += target
>--- src/plugins/plugins.pro.old	2005-09-13 22:51:32.000000000 +0800
>+++ src/plugins/plugins.pro	2005-09-13 22:51:41.000000000 +0800
>@@ -1,7 +1,6 @@
> TEMPLATE = subdirs
> 
> dll|shared {
>-	SUBDIRS	*= accessible codecs imageformats sqldrivers
>+	SUBDIRS	*= accessible codecs imageformats sqldrivers inputmethods
> 	embedded:SUBDIRS *=  gfxdrivers decorations
>-	x11:SUBDIRS *= inputmethods
> }

Actions: View | Diff

Attachments on bug 116778: 49780