summaryrefslogtreecommitdiffstats
path: root/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_01_58-Fix-Qt-input-method-failure-This-resolves-Bug-1019-c421de2.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_01_58-Fix-Qt-input-method-failure-This-resolves-Bug-1019-c421de2.patch')
-rw-r--r--dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_01_58-Fix-Qt-input-method-failure-This-resolves-Bug-1019-c421de2.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_01_58-Fix-Qt-input-method-failure-This-resolves-Bug-1019-c421de2.patch b/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_01_58-Fix-Qt-input-method-failure-This-resolves-Bug-1019-c421de2.patch
new file mode 100644
index 00000000..3df8e73b
--- /dev/null
+++ b/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-04-20_19_01_58-Fix-Qt-input-method-failure-This-resolves-Bug-1019-c421de2.patch
@@ -0,0 +1,45 @@
+diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
+index 50a2bac..9236f3a 100644
+--- a/src/kernel/qapplication_x11.cpp
++++ b/src/kernel/qapplication_x11.cpp
+@@ -195,7 +195,7 @@ static const char *appBTNCol = 0; // application btn color
+ static const char *mwGeometry = 0; // main widget geometry
+ static const char *mwTitle = 0; // main widget title
+ //Ming-Che 10/10
+-char *qt_ximServer = 0; // XIM Server will connect to
++Q_EXPORT char *qt_ximServer = 0; // XIM Server will connect to
+ static bool mwIconic = FALSE; // main widget iconified
+ //Ming-Che 10/10
+ static Display *appDpy = 0; // X11 application display
+@@ -415,13 +415,13 @@ static bool qt_x11EventFilter( XEvent* ev )
+
+ #if !defined(QT_NO_XIM)
+ //XIM qt_xim = 0;
+-XIMStyle qt_xim_style = 0;
+-XIMStyle qt_xim_preferred_style = 0;
+-static XIMStyle xim_default_style = XIMPreeditCallbacks | XIMStatusNothing;
++Q_EXPORT XIMStyle qt_xim_style = 0;
++Q_EXPORT XIMStyle qt_xim_preferred_style = 0;
++Q_EXPORT static XIMStyle xim_default_style = XIMPreeditCallbacks | XIMStatusNothing;
+ #endif
+
+-int qt_ximComposingKeycode=0;
+-QTextCodec * qt_input_mapper = 0;
++Q_EXPORT int qt_ximComposingKeycode=0;
++Q_EXPORT QTextCodec * qt_input_mapper = 0;
+
+ Q_EXPORT Time qt_x_time = CurrentTime;
+ Q_EXPORT Time qt_x_user_time = CurrentTime;
+diff --git a/src/kernel/qinputcontext.h b/src/kernel/qinputcontext.h
+index 99e5d37..5b2650a 100644
+--- a/src/kernel/qinputcontext.h
++++ b/src/kernel/qinputcontext.h
+@@ -69,7 +69,7 @@ struct QInputContextMenu {
+ };
+
+
+-class QInputContext : public QObject
++class Q_EXPORT QInputContext : public QObject
+ {
+ Q_OBJECT
+ public: