diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-12-01 23:30:53 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-12-01 23:30:53 -0600 |
| commit | 6955a7ebe3c3a0ae2af416fc57ca1f3e9af0ecc3 (patch) | |
| tree | 76f40d456bda2b31029c7fb0354cc22102f435d6 /src/kernel/qapplication_x11.cpp | |
| parent | 4c50ba8f9e58dc81abaf1407cc8b203c28288370 (diff) | |
| download | tqt3-6955a7ebe3c3a0ae2af416fc57ca1f3e9af0ecc3.tar.gz tqt3-6955a7ebe3c3a0ae2af416fc57ca1f3e9af0ecc3.zip | |
Automated update from Qt3
Diffstat (limited to 'src/kernel/qapplication_x11.cpp')
| -rw-r--r-- | src/kernel/qapplication_x11.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index e76dd1d72..8602b5625 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -430,7 +430,7 @@ static bool qt_x11EventFilter( XEvent* ev ) //XIM qt_xim = 0; Q_EXPORT XIMStyle qt_xim_style = 0; Q_EXPORT XIMStyle qt_xim_preferred_style = 0; -Q_EXPORT static XIMStyle xim_default_style = XIMPreeditCallbacks | XIMStatusNothing; +static XIMStyle xim_default_style = XIMPreeditCallbacks | XIMStatusNothing; #endif Q_EXPORT int qt_ximComposingKeycode=0; @@ -5889,7 +5889,7 @@ static Bool qt_net_wm_sync_request_scanner(Display*, XEvent* event, XPointer arg { return (event->type == ClientMessage && event->xclient.window == *(Window*)arg && event->xclient.message_type == tqt_wm_protocols - && event->xclient.data.l[ 0 ] == qt_net_wm_sync_request ); + && ((unsigned int)event->xclient.data.l[ 0 ]) == qt_net_wm_sync_request ); } #endif |