diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-23 10:36:57 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-23 10:31:15 +0000 |
| commit | e86509016c8940826774f7a803823b2dfd9b6944 (patch) | |
| tree | 67c7183f883ca0b24d4c73efcf06f6e771999c35 /src/gui | |
| parent | cd408af9bc11881f351b359ebf81f02f0f69ef86 (diff) | |
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
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/.prev_CMakeLists.txt | 19 | ||||
| -rw-r--r-- | src/gui/CMakeLists.txt | 19 |
2 files changed, 26 insertions, 12 deletions
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index 9138f4a878..c30f342222 100644 --- a/src/gui/.prev_CMakeLists.txt +++ b/src/gui/.prev_CMakeLists.txt @@ -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 diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index aec3af8545..e6cef83c45 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -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 |