diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-27 20:55:08 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-27 20:55:08 -0600 |
| commit | 2211b1bf66c8a1705730ccb10f417bda7ed60593 (patch) | |
| tree | 5cefd31ac15882a5589a41040ce7ae258538d9df /src/kernel/qeventloop_p.h | |
| parent | 20ccd4b81eee8c0d20b4cabdcdc8ed8356e51f21 (diff) | |
| parent | de67a2b84b0d8b8ef994e91c108af3273e2ac37f (diff) | |
| download | qt3-2211b1bf66c8a1705730ccb10f417bda7ed60593.tar.gz qt3-2211b1bf66c8a1705730ccb10f417bda7ed60593.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/kernel/qeventloop_p.h')
| -rw-r--r-- | src/kernel/qeventloop_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/kernel/qeventloop_p.h b/src/kernel/qeventloop_p.h index 4e7e365..7935d73 100644 --- a/src/kernel/qeventloop_p.h +++ b/src/kernel/qeventloop_p.h @@ -49,6 +49,10 @@ // // +#if defined(QT_USE_GLIBMAINLOOP) +#include "qeventloop_glib_p.h" // use a different header file!!! +#else + #ifndef QT_H #include "qplatformdefs.h" #endif // QT_H @@ -147,4 +151,6 @@ public: }; +#endif // !QT_USE_GLIBMAINLOOP + #endif // QEVENTLOOP_P_H |