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

@@ -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

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)

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

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>