diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-02-03 20:26:24 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-06 14:32:09 +0100 |
| commit | ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb (patch) | |
| tree | fefb0a008603849dc88a069d564427618b526906 /src/corelib/global/global.pri | |
| parent | 3282b060d19f73ade5b7370983dbea75c130166b (diff) | |
Move operating system detection from qglobal.h to a separate header
qsystemdetection.h is included from qglobal.h, and does all Q_OS_*
detection
A side-effect of this change is that QT_BEGIN_HEADER and QT_END_HEADER
started being defined on Mac OS X, which ends up breaking the build
in some cases. Since QT_BEGIN_HEADER and QT_END_HEADER have been
defined to nothing in the past, even on Mac OS X, change these 2
to be unconditionally defined to nothing.
Change-Id: Ibc8a0aa2207664741c25627d7621e006c2ce80d3
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global/global.pri')
| -rw-r--r-- | src/corelib/global/global.pri | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri index fca9969db0..ded3e4db57 100644 --- a/src/corelib/global/global.pri +++ b/src/corelib/global/global.pri @@ -2,6 +2,7 @@ HEADERS += \ global/qglobal.h \ + global/qsystemdetection.h \ global/qnamespace.h \ global/qendian.h \ global/qnumeric_p.h \ |