diff options
| author | Timothy Pearson <[email protected]> | 2012-12-01 23:30:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-12-01 23:30:27 -0600 |
| commit | 7aa5ac7f0e76c5b87e4ca837b75b3edd522a3372 (patch) | |
| tree | 9eff0506756adca6934846467804a19f291b4509 /src/kernel/qapplication_x11.cpp | |
| parent | bb07131a9191affa4c66f6bc720a388f96343836 (diff) | |
| download | qt3-7aa5ac7f0e76c5b87e4ca837b75b3edd522a3372.tar.gz qt3-7aa5ac7f0e76c5b87e4ca837b75b3edd522a3372.zip | |
Fix a number of build warnings that could lead to unstable operation
This breaks the ABI
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 2873b9e..c2c0288 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 == qt_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 |