diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-27 20:55:12 -0600 |
---|---|---|
committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-27 20:55:12 -0600 |
commit | 992df30f3c50b5439c2b5f8621ab6e928d9346eb (patch) | |
tree | acdd3b48b9f30eeda4f94092172ffb3042fca766 /src/kernel/qeventloop_p.h | |
parent | 74ce99a42a0dc9d9a168156a2f5d146edb9bb555 (diff) | |
parent | 84f70969d95344d402d6f6152a6373469a3718ca (diff) | |
download | tqt3-992df30f3c50b5439c2b5f8621ab6e928d9346eb.tar.gz tqt3-992df30f3c50b5439c2b5f8621ab6e928d9346eb.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
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 7eb32a5d8..35a0ae95e 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 // TQEVENTLOOP_P_H |