diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-03-12 20:05:08 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-03-12 20:06:01 +0100 |
| commit | 42bbe3a96ff4dfe4e2d34d522fd67c386a6c3647 (patch) | |
| tree | 125507fca78632f372c6eb1a9f62c87989c44567 /vcl/unx/kde4/KDEXLib.cxx | |
| parent | 6fbd87113576540ff42a03f4b08857bd066f9161 (diff) | |
Qt4.8 is enough for Qt glib integration support working properly
Change-Id: Ifaec37040f81de2718506b1ed27c7b52e74c513b
Diffstat (limited to 'vcl/unx/kde4/KDEXLib.cxx')
| -rw-r--r-- | vcl/unx/kde4/KDEXLib.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index 8bdad526ea22..86495eb73b4b 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -48,10 +48,11 @@ #if QT_VERSION >= QT_VERSION_CHECK( 4, 9, 0 ) #define QT_UNIX_EVENT_LOOP_SUPPORT +#endif + #ifdef KDE_HAVE_GLIB #define GLIB_EVENT_LOOP_SUPPORT #endif -#endif #ifdef GLIB_EVENT_LOOP_SUPPORT #include <glib-2.0/glib.h> @@ -204,7 +205,8 @@ void KDEXLib::setupEventLoop() // The catch is that Qt has a bug that allows triggering timers even when they should // not be, leading to crashes caused by QClipboard re-entering the event loop. // (http://bugreports.qt.nokia.com/browse/QTBUG-14461), so enable only with Qt>=4.8.0, -// where it is(?) fixed. +// where it is fixed. +#if QT_VERSION >= QT_VERSION_CHECK( 4, 8, 0 ) if( QAbstractEventDispatcher::instance()->inherits( "QEventDispatcherGlib" )) { eventLoopType = GlibEventLoop; @@ -216,6 +218,7 @@ void KDEXLib::setupEventLoop() return; } #endif +#endif #ifdef QT_UNIX_EVENT_LOOP_SUPPORT // When Qt does not use Glib support, it uses its own Unix event dispatcher. // That one has aboutToBlock() and awake() signals, but they are broken (either |