diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qtypetraits.h | 3 | ||||
| -rw-r--r-- | src/corelib/kernel/qwineventnotifier.h | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/global/qtypetraits.h b/src/corelib/global/qtypetraits.h index 0183f33738f..54b48667b4f 100644 --- a/src/corelib/global/qtypetraits.h +++ b/src/corelib/global/qtypetraits.h @@ -102,11 +102,12 @@ // - Use Qt macros for long long type differences on Windows. // - Enclose in QtPrivate namespace. +#include "QtCore/qglobal.h" + #ifndef QTYPETRAITS_H #define QTYPETRAITS_H #include <utility> // For pair -#include "QtCore/qglobal.h" QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/corelib/kernel/qwineventnotifier.h b/src/corelib/kernel/qwineventnotifier.h index d5e4d0f7e3f..291d953e583 100644 --- a/src/corelib/kernel/qwineventnotifier.h +++ b/src/corelib/kernel/qwineventnotifier.h @@ -42,12 +42,9 @@ #ifndef QWINEVENTNOTIFIER_H #define QWINEVENTNOTIFIER_H -#if 0 -// inform syncqt -#pragma qt_no_master_include -#endif - #include "QtCore/qobject.h" + +#ifdef Q_OS_WIN #include "QtCore/qt_windows.h" QT_BEGIN_HEADER @@ -88,4 +85,6 @@ QT_END_NAMESPACE QT_END_HEADER +#endif // Q_OS_WIN + #endif // QWINEVENTNOTIFIER_H |