diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-11-01 12:31:50 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-02-26 13:13:27 +0100 |
| commit | 3bc4afc223bcd56245797a0bd3628f02a992301c (patch) | |
| tree | 6ecd384c3350e6fece45366d32ba8af5a2aed6fe /mkspecs/common/ios.conf | |
| parent | 8224e5ac7f5f69a64b6ad62bb60277a274bcc60e (diff) | |
iOS: Move Q_OS_IOS out of makesespec to qsystemdetection.h
We treat iOS as a variant of Mac OS, so for iOS both Q_OS_MAC and
Q_OS_IOS will be defined. This matches what Apple assumes in the
header file TargetConditionals.h
Change-Id: I55cc851401b748297478e4c32e84e0f6e1fdfc28
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'mkspecs/common/ios.conf')
| -rw-r--r-- | mkspecs/common/ios.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/ios.conf b/mkspecs/common/ios.conf index 7420b56daf..c588222666 100644 --- a/mkspecs/common/ios.conf +++ b/mkspecs/common/ios.conf @@ -16,4 +16,4 @@ QMAKE_MACOSX_DEPLOYMENT_TARGET = INCLUDEPATH += $$PWD/ios # iOS defines -DEFINES += DARWIN_NO_CARBON Q_OS_IOS QT_NO_CORESERVICES QT_NO_PRINTER QT_NO_PRINTDIALOG +DEFINES += DARWIN_NO_CARBON QT_NO_CORESERVICES QT_NO_PRINTER QT_NO_PRINTDIALOG |