From bb07131a9191affa4c66f6bc720a388f96343836 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 29 Nov 2012 15:40:32 -0600 Subject: Add ability to enable/disable glib event pass through This resolves problems experienced with TDE GTK theme engines when Qt3 glib event loop integration is enabled --- src/kernel/qeventloop.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/kernel/qeventloop.h') diff --git a/src/kernel/qeventloop.h b/src/kernel/qeventloop.h index 9a79f6c..25f80cd 100644 --- a/src/kernel/qeventloop.h +++ b/src/kernel/qeventloop.h @@ -44,9 +44,12 @@ #include "qsocketnotifier.h" #endif // QT_H +#ifdef Q_QDOC +#else // Q_QDOC #if defined(QT_USE_GLIBMAINLOOP) #include #endif // QT_USE_GLIBMAINLOOP +#endif // Q_QDOC class QEventLoopPrivate; class QSocketNotifier; @@ -99,7 +102,9 @@ public: virtual void wakeUp(); -#if defined(QT_USE_GLIBMAINLOOP) +#ifdef Q_QDOC +#else // Q_QDOC +#if defined(QT_USE_GLIBMAINLOOP) // glib main loop support @@ -114,7 +119,10 @@ public: // end glib main loop support #endif //QT_USE_GLIBMAINLOOP - +#endif // Q_QDOC + + void setSingleToolkitEventHandling(bool enabled); + signals: void awake(); void aboutToBlock(); -- cgit v1.2.1