Fix mapping of Apple platforms in pro2cmake.py

"mac" scope in qmake actually means all mac platforms,
just like "darwin", aka macOS, iOS, watchOS, etc.

Regenerate corelib, gui and testlib after this modification.
This is a requirement for the iOS port.

Change-Id: I029c7e907d13f6ec31816a08602a5930f9ac16a7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot

1 files changed, 33 insertions, 18 deletions

diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt
index bab176c132..eb02076dfe 100644
--- a/src/corelib/.prev_CMakeLists.txt
+++ b/src/corelib/.prev_CMakeLists.txt
@@ -364,13 +364,6 @@ extend_target(Core CONDITION WIN32 AND NOT WINRT
 extend_target(Core CONDITION APPLE
     SOURCES
         global/qoperatingsystemversion_darwin.mm
-    LIBRARIES
-        ${FWCoreFoundation}
-        ${FWFoundation}
-)
-
-extend_target(Core CONDITION APPLE_OSX
-    SOURCES
         io/qstandardpaths_mac.mm
         io/qstorageinfo_mac.cpp
         kernel/qcfsocketnotifier.cpp kernel/qcfsocketnotifier_p.h
@@ -380,10 +373,15 @@ extend_target(Core CONDITION APPLE_OSX
         kernel/qcoreapplication_mac.cpp
         kernel/qeventdispatcher_cf.mm kernel/qeventdispatcher_cf_p.h
     LIBRARIES
+        ${FWCoreFoundation}
+        ${FWFoundation}
+)
+
+extend_target(Core CONDITION APPLE_OSX
+    LIBRARIES
         ${FWAppKit}
         ${FWApplicationServices}
         ${FWCoreServices}
-        ${FWFoundation}
         ${FWSecurity}
     PUBLIC_LIBRARIES
         ${FWDiskArbitration}
@@ -483,6 +481,11 @@ extend_target(Core CONDITION QT_FEATURE_journald
 #### Keys ignored in scope 38:.:global:global/global.pri:silent:
 # versiontagging_compiler.commands = "@echo" "compiling[versiontagging]" "${QMAKE_FILE_IN}" "&&"
 
+extend_target(Core CONDITION NOT GCC OR NOT ltcg
+    SOURCES
+        global/qversiontagging.cpp
+)
+
 extend_target(Core CONDITION UNIX
     SOURCES
         io/qfilesystemengine_unix.cpp
@@ -566,18 +569,18 @@ extend_target(Core CONDITION MSVC
         tools/qvector_msvc.cpp
 )
 
-extend_target(Core CONDITION APPLE_OSX AND NOT NACL
+extend_target(Core CONDITION APPLE AND NOT NACL
     SOURCES
         kernel/qelapsedtimer_mac.cpp
         tools/qlocale_mac.mm
 )
 
-extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE_OSX)
+extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE)
     SOURCES
         tools/qlocale_unix.cpp
 )
 
-extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE_OSX)
+extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE)
     SOURCES
         tools/qlocale_win.cpp
 )
@@ -753,11 +756,16 @@ extend_target(Core CONDITION UNIX AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT
         ../3rdparty/forkfd
 )
 
-extend_target(Core CONDITION APPLE_OSX AND QT_FEATURE_processenvironment
+extend_target(Core CONDITION APPLE AND QT_FEATURE_processenvironment
     SOURCES
         io/qprocess_darwin.mm
 )
 
+extend_target(Core CONDITION APPLE AND NOT APPLE_OSX
+    PUBLIC_LIBRARIES
+        ${FWMobileCoreServices}
+)
+
 extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED
     SOURCES
         io/qstandardpaths_android.cpp
@@ -775,7 +783,7 @@ extend_target(Core CONDITION HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)
         be
 )
 
-extend_target(Core CONDITION UNIX AND NOT APPLE_OSX AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)
+extend_target(Core CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)
     SOURCES
         io/qstandardpaths_unix.cpp
         io/qstorageinfo_unix.cpp
@@ -833,12 +841,12 @@ extend_target(Core CONDITION QT_FEATURE_dlopen AND QT_FEATURE_library
         ${CMAKE_DL_LIBS}
 )
 
-extend_target(Core CONDITION APPLE_OSX AND (APPLE_IOS OR APPLE_TVOS)
+extend_target(Core CONDITION APPLE AND (APPLE_IOS OR APPLE_TVOS)
     LIBRARIES
         ${FWUIKit}
 )
 
-extend_target(Core CONDITION APPLE_OSX AND APPLE_WATCHOS
+extend_target(Core CONDITION APPLE_WATCHOS
     LIBRARIES
         ${FWWatchKit}
 )
@@ -960,9 +968,16 @@ extend_target(Core CONDITION QT_FEATURE_mimetype
 
 # Resources:
 set_source_files_properties("mimetypes/mime/packages/freedesktop.org.xml"
-    PROPERTIES alias "freedesktop.org.xml")
-add_qt_resource(Core "mimetypes" PREFIX "/qt-project.org/qmime/packages" BASE "mimetypes" FILES
-    mime/packages/freedesktop.org.xml)
+    PROPERTIES alias "freedesktop.org.xml"
+)
+add_qt_resource(Core "mimetypes"
+    PREFIX
+        "/qt-project.org/qmime/packages"
+    BASE
+        "mimetypes"
+    FILES
+        mime/packages/freedesktop.org.xml
+)
 
 
 extend_target(Core CONDITION WASM