diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-29 20:03:31 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-29 20:03:31 -0600 |
| commit | 8d5add0e87ad913bdf0362a83f431995115f3bfa (patch) | |
| tree | d6c80d23e45772f23d747410fd051e058c95298e /src/kernel/qeventloop.h | |
| parent | 2211b1bf66c8a1705730ccb10f417bda7ed60593 (diff) | |
| parent | bb07131a9191affa4c66f6bc720a388f96343836 (diff) | |
| download | qt3-8d5add0e87ad913bdf0362a83f431995115f3bfa.tar.gz qt3-8d5add0e87ad913bdf0362a83f431995115f3bfa.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/kernel/qeventloop.h')
| -rw-r--r-- | src/kernel/qeventloop.h | 12 |
1 files changed, 10 insertions, 2 deletions
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 <glib.h> #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(); |