From 3bc4afc223bcd56245797a0bd3628f02a992301c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@digia.com>
Date: Thu, 1 Nov 2012 12:31:50 +0100
Subject: 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>
---
 mkspecs/common/ios.conf                                        | 2 +-
 src/corelib/global/qsystemdetection.h                          | 6 ++++++
 src/corelib/kernel/qcore_mac_p.h                               | 2 ++
 src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm | 2 ++
 4 files changed, 11 insertions(+), 1 deletion(-)

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
diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h
index eb7aa2e64f..86c724ebb5 100644
--- a/src/corelib/global/qsystemdetection.h
+++ b/src/corelib/global/qsystemdetection.h
@@ -50,6 +50,8 @@
    The operating system, must be one of: (Q_OS_x)
 
      DARWIN   - Darwin OS (synonym for Q_OS_MAC)
+     MAC      - Mac OS X or iOS (iPhoneOS)
+     IOS      - iOS (treated as a variant of Mac OS)
      MSDOS    - MS-DOS and Windows
      OS2      - OS/2
      OS2EMX   - XFree86 on OS/2 (not PM)
@@ -166,6 +168,10 @@
 #  elif defined(Q_OS_DARWIN32)
 #     define Q_OS_MAC32
 #  endif
+#  include <TargetConditionals.h>
+#  if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+#     define Q_OS_IOS
+#  endif
 #endif
 
 #if defined(Q_OS_WIN)
diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h
index b833eb4962..361a6c2c67 100644
--- a/src/corelib/kernel/qcore_mac_p.h
+++ b/src/corelib/kernel/qcore_mac_p.h
@@ -63,6 +63,8 @@
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
+#include "qglobal.h"
+
 #ifndef Q_OS_IOS
 #include <CoreServices/CoreServices.h>
 #endif
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index ef5bdbbf0d..fbd836f763 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+#include "qglobal.h"
+
 #ifndef Q_OS_IOS
 #import <Cocoa/Cocoa.h>
 #import <IOKit/graphics/IOGraphicsLib.h>
-- 
cgit v1.2.3