diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-13 11:00:43 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-13 11:00:43 -0500 |
| commit | 92169cdde478373777a9119c98671a6615cb303c (patch) | |
| tree | fe7b41674c4e0ea613a36c5bee0b0ecbe471d7bd /src | |
| parent | 2a773ed1049018a063583baa0f0b73971dd5aee2 (diff) | |
| parent | 70604905b06eb92f2eb410d24721a3a718a3a18f (diff) | |
| download | tqt3-92169cdde478373777a9119c98671a6615cb303c.tar.gz tqt3-92169cdde478373777a9119c98671a6615cb303c.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src')
| -rw-r--r-- | src/kernel/ntqinputcontext.h | 2 | ||||
| -rw-r--r-- | src/kernel/qapplication_x11.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/kernel/ntqinputcontext.h b/src/kernel/ntqinputcontext.h index 4eaddb8ed..c39939b47 100644 --- a/src/kernel/ntqinputcontext.h +++ b/src/kernel/ntqinputcontext.h @@ -69,7 +69,7 @@ struct TQInputContextMenu { }; -class TQInputContext : public TQObject +class Q_EXPORT TQInputContext : public TQObject { TQ_OBJECT public: diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index b3bf9b7f2..0baf4c3bb 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 @@ -428,13 +428,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; -TQTextCodec * qt_input_mapper = 0; +Q_EXPORT int qt_ximComposingKeycode=0; +Q_EXPORT TQTextCodec * qt_input_mapper = 0; Q_EXPORT Time tqt_x_time = CurrentTime; Q_EXPORT Time tqt_x_user_time = CurrentTime; |