diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-12-22 13:07:11 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-01 23:50:00 +0100 |
| commit | 2119c8f291e586b44f97f757097c2cc047bd61d1 (patch) | |
| tree | 97bade90c85d9afae9c0d5d227508a4b30abf406 /src/corelib/kernel | |
| parent | d443953e6a08ceea809ada6efbada4cd55cac4f3 (diff) | |
Make these headers includable directly, on all systems
For qwineventnotifier.h, just wrap the code around #ifdef Q_OS_WIN. This
has the added benefit of fixing the current qt_no_master_include problem
(that is, even if you #include <QtCore> on Windows, you wouldn't get
it).
For qtypetraits.h, it requires qglobal.h first.
Change-Id: If1ba09a0a29de429a5b87e9878c8ac6a62a443c4
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qwineventnotifier.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/corelib/kernel/qwineventnotifier.h b/src/corelib/kernel/qwineventnotifier.h index d5e4d0f7e3..291d953e58 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 |