AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mapping of Apple platforms in pro2cmake.py

Browse Source 
"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
This commit is contained in:
Alexandru Croitor 2019-07-23 10:36:57 +02:00
parent cd408af9bc
commit e86509016c
7 changed files with 102 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/corelib/.prev_CMakeLists.txt
View File

@ -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
@ -379,11 +372,16 @@ extend_target(Core CONDITION APPLE_OSX
kernel/qcore_mac_objc.mm
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

38
src/corelib/CMakeLists.txt
View File

@ -445,13 +445,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
@ -460,11 +453,16 @@ extend_target(Core CONDITION APPLE_OSX
kernel/qcore_mac_objc.mm
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}
@ -561,6 +559,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
@ -644,18 +647,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
)
@ -831,11 +834,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
@ -853,7 +861,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
@ -911,12 +919,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}
)

19
src/gui/.prev_CMakeLists.txt
View File

@ -224,10 +224,17 @@ add_qt_module(Gui
# Resources:
set_source_files_properties("painting/../../3rdparty/icc/sRGB2014.icc"
PROPERTIES alias "sRGB2014.icc")
add_qt_resource(Gui "qpdf" PREFIX "qpdf/" BASE "painting" FILES
../../3rdparty/icc/sRGB2014.icc
qpdfa_metadata.xml)
PROPERTIES alias "sRGB2014.icc"
)
add_qt_resource(Gui "qpdf"
PREFIX
"qpdf/"
BASE
"painting"
FILES
../../3rdparty/icc/sRGB2014.icc
qpdfa_metadata.xml
)
add_qt_simd_part(Gui SIMD sse2
SOURCES
@ -405,7 +412,7 @@ extend_target(Gui CONDITION WIN32
#### Keys ignored in scope 20:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ISEMPTY:
# CMAKE_OPENGL_LIBDIR = "$$cmakePortablePaths$$QMAKE_LIBDIR_OPENGL"
#### Keys ignored in scope 21:.:.:gui.pro:APPLE_OSX:
#### Keys ignored in scope 21:.:.:gui.pro:APPLE:
# CMAKE_GL_HEADER_NAME = "gl.h"
#### Keys ignored in scope 22:.:.:gui.pro:QT_FEATURE_egl:
@ -421,7 +428,7 @@ extend_target(Gui CONDITION QT_FEATURE_accessibility
accessible/qplatformaccessibility.cpp accessible/qplatformaccessibility.h
)
extend_target(Gui CONDITION APPLE_OSX AND QT_FEATURE_accessibility
extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility
SOURCES
accessible/qaccessiblecache_mac.mm
LIBRARIES

19
src/gui/CMakeLists.txt
View File

@ -276,10 +276,17 @@ add_qt_resource(Gui qmake_webgradients PREFIX "/qgradient" BASE "painting" FILES
# special case end
set_source_files_properties("painting/../../3rdparty/icc/sRGB2014.icc"
PROPERTIES alias "sRGB2014.icc")
add_qt_resource(Gui "qpdf" PREFIX "qpdf/" BASE "painting" FILES
../../3rdparty/icc/sRGB2014.icc
qpdfa_metadata.xml)
PROPERTIES alias "sRGB2014.icc"
)
add_qt_resource(Gui "qpdf"
PREFIX
"qpdf/"
BASE
"painting"
FILES
../../3rdparty/icc/sRGB2014.icc
qpdfa_metadata.xml
)
add_qt_simd_part(Gui SIMD sse2
SOURCES
@ -485,7 +492,7 @@ extend_target(Gui CONDITION WIN32
#### Keys ignored in scope 20:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ISEMPTY:
# CMAKE_OPENGL_LIBDIR = "$$cmakePortablePaths$$QMAKE_LIBDIR_OPENGL"
#### Keys ignored in scope 21:.:.:gui.pro:APPLE_OSX:
#### Keys ignored in scope 21:.:.:gui.pro:APPLE:
# CMAKE_GL_HEADER_NAME = "gl.h"
#### Keys ignored in scope 22:.:.:gui.pro:QT_FEATURE_egl:
@ -501,7 +508,7 @@ extend_target(Gui CONDITION QT_FEATURE_accessibility
accessible/qplatformaccessibility.cpp accessible/qplatformaccessibility.h
)
extend_target(Gui CONDITION APPLE_OSX AND QT_FEATURE_accessibility
extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility
SOURCES
accessible/qaccessiblecache_mac.mm
LIBRARIES

13
src/testlib/.prev_CMakeLists.txt
View File

@ -94,18 +94,23 @@ extend_target(Test CONDITION embedded
-fno-rtti
)
extend_target(Test CONDITION APPLE_OSX
extend_target(Test CONDITION APPLE
SOURCES
qappletestlogger.cpp qappletestlogger_p.h
PUBLIC_LIBRARIES
${FWSecurity}
)
extend_target(Test CONDITION APPLE_OSX
SOURCES
qtestutil_macos.mm qtestutil_macos_p.h
PUBLIC_LIBRARIES
${FWApplicationServices}
${FWFoundation}
${FWIOKit}
${FWSecurity}
)
extend_target(Test CONDITION (APPLE_OSX) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))
extend_target(Test CONDITION (APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))
SOURCES
qxctestlogger.mm qxctestlogger_p.h
DEFINES
@ -117,7 +122,7 @@ extend_target(Test CONDITION (APPLE_OSX) AND (OFF AND NOT lessThan(QMAKE_XCODE_V
#### Keys ignored in scope 8:.:.:testlib.pro:OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"):
# _LOADED = "sdk"
extend_target(Test CONDITION ((APPLE_OSX) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY)
extend_target(Test CONDITION ((APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY)
COMPILE_OPTIONS
-F/Developer/Library/Frameworks
LINK_OPTIONS

12
src/testlib/CMakeLists.txt
View File

@ -92,17 +92,25 @@ extend_target(Test CONDITION embedded
-fno-rtti
)
extend_target(Test CONDITION APPLE_OSX
extend_target(Test CONDITION APPLE
SOURCES
qappletestlogger.cpp qappletestlogger_p.h
PUBLIC_LIBRARIES
${FWSecurity}
)
extend_target(Test CONDITION APPLE_OSX
SOURCES
qtestutil_macos.mm qtestutil_macos_p.h
PUBLIC_LIBRARIES
${FWApplicationServices}
${FWFoundation}
${FWIOKit}
${FWSecurity}
)
#### Keys ignored in scope 8:.:.:testlib.pro:OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"):
# _LOADED = "sdk"
# special case begin
# Do not bother with disabled stuff:
# extend_target(Test CONDITION (APPLE_OSX) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) ...

2
util/cmake/helper.py
View File

@ -356,7 +356,7 @@ platform_mapping = {
'netbsd': 'NETBSD',
'haiku': 'HAIKU',
'netbsd': 'NETBSD',
'mac': 'APPLE_OSX',
'mac': 'APPLE',
'macx': 'APPLE_OSX',
'macos': 'APPLE_OSX',
'macx-icc': '(APPLE_OSX AND ICC)',