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/global | |
| 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/global')
| -rw-r--r-- | src/corelib/global/qtypetraits.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/global/qtypetraits.h b/src/corelib/global/qtypetraits.h index 0183f33738..54b48667b4 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 |