From 4e945ea2f8e0e1e8eb512e3d590da12661a674cd Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 14 Oct 2016 14:52:38 +0200 Subject: Get rid of simulator_and_device CONFIG option (mostly) A separate flag is no longer needed now that simulator and device builds are not exclusive any more (*) - both 'simulator' and 'device' being set at the same time is a sufficient indication (uikit/default_pre.prf sets this up according to the simulator_and_device feature and the QMAKE_MAC_SDK variable). (*) xcodebuild mode actually still uses exclusive builds, but this is activated locally in uikit/default_post.prf, and uikit/xcodebuild.prf implements the actual build passes manually anyway, so this change does not affect it. Change-Id: Idf173a7bfeb984498d3a49ed6b8d1a16da6c2089 Reviewed-by: Jake Petroules --- .../widgets/tools/plugandpaint/plugins/basictools/basictools.pro | 2 +- .../widgets/tools/plugandpaint/plugins/extrafilters/extrafilters.pro | 2 +- mkspecs/features/mac/sdk.prf | 5 ++++- mkspecs/features/qml_plugin.prf | 1 - mkspecs/features/qt_helper_lib.prf | 1 - mkspecs/features/qt_module.prf | 1 - mkspecs/features/qt_plugin.prf | 1 - mkspecs/features/uikit/default_post.prf | 5 ++++- mkspecs/features/uikit/sdk.prf | 3 --- 9 files changed, 10 insertions(+), 11 deletions(-) diff --git a/examples/widgets/tools/plugandpaint/plugins/basictools/basictools.pro b/examples/widgets/tools/plugandpaint/plugins/basictools/basictools.pro index 8317019c10..f5ba95252c 100644 --- a/examples/widgets/tools/plugandpaint/plugins/basictools/basictools.pro +++ b/examples/widgets/tools/plugandpaint/plugins/basictools/basictools.pro @@ -14,4 +14,4 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/plugandpaint/plugins INSTALLS += target CONFIG += install_ok # Do not cargo-cult this! -uikit: CONFIG += debug_and_release simulator_and_device +uikit: CONFIG += debug_and_release diff --git a/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafilters.pro b/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafilters.pro index 4716665d34..e137b04823 100644 --- a/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafilters.pro +++ b/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafilters.pro @@ -14,4 +14,4 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools/plugandpaint/plugins INSTALLS += target CONFIG += install_ok # Do not cargo-cult this! -uikit: CONFIG += debug_and_release simulator_and_device +uikit: CONFIG += debug_and_release diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf index a572faac6a..c7f5850aa0 100644 --- a/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf @@ -54,10 +54,13 @@ for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_ tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET - !simulator|simulator_and_device: device_archs = $$QMAKE_APPLE_DEVICE_ARCHS + device|!simulator: device_archs = $$QMAKE_APPLE_DEVICE_ARCHS simulator: simulator_archs = $$QMAKE_APPLE_SIMULATOR_ARCHS archs = $$device_archs $$simulator_archs + isEmpty(archs): \ + error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture") + QMAKE_XARCH_CFLAGS = QMAKE_XARCH_LFLAGS = QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf index 149b3cff56..7e12626db3 100644 --- a/mkspecs/features/qml_plugin.prf +++ b/mkspecs/features/qml_plugin.prf @@ -15,7 +15,6 @@ TEMPLATE = lib CONFIG += plugin if(win32|mac):!macx-xcode { - qtConfig(simulator_and_device): CONFIG += simulator_and_device qtConfig(debug_and_release): CONFIG += debug_and_release qtConfig(build_all): CONFIG += build_all } diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf index f0072f82db..07e4f48771 100644 --- a/mkspecs/features/qt_helper_lib.prf +++ b/mkspecs/features/qt_helper_lib.prf @@ -21,7 +21,6 @@ DEFINES += $$MODULE_DEFINES CONFIG -= warning_clean # Don't presume 3rd party code to be clean load(qt_common) -qtConfig(simulator_and_device): CONFIG += simulator_and_device qtConfig(debug_and_release): CONFIG += debug_and_release qtConfig(build_all): CONFIG += build_all diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 1df41065af..f19abec8be 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -84,7 +84,6 @@ INCLUDEPATH *= $$eval(QT.$${MODULE}.includes) $$eval(QT.$${MODULE}_private.inclu # If Qt was configured with -debug-and-release then build the module the same way # - unless this is a host library !host_build:if(win32|mac):!macx-xcode { - qtConfig(simulator_and_device): CONFIG += simulator_and_device qtConfig(debug_and_release): CONFIG += debug_and_release qtConfig(build_all): CONFIG += build_all } diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf index 2179c7ca22..265b4ea8a2 100644 --- a/mkspecs/features/qt_plugin.prf +++ b/mkspecs/features/qt_plugin.prf @@ -26,7 +26,6 @@ win32:CONFIG(shared, static|shared) { tool_plugin { !build_pass:qtConfig(debug_and_release): CONFIG += release } else:if(win32|mac):!macx-xcode { - qtConfig(simulator_and_device): CONFIG += simulator_and_device qtConfig(debug_and_release): CONFIG += debug_and_release qtConfig(build_all): CONFIG += build_all } diff --git a/mkspecs/features/uikit/default_post.prf b/mkspecs/features/uikit/default_post.prf index 37a006b7ee..6e23e23a6a 100644 --- a/mkspecs/features/uikit/default_post.prf +++ b/mkspecs/features/uikit/default_post.prf @@ -69,9 +69,12 @@ macx-xcode { QMAKE_MAC_XCODE_SETTINGS += only_active_arch } else { VALID_ARCHS = - !simulator|simulator_and_device: VALID_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS + device|!simulator: VALID_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS simulator: VALID_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS + isEmpty(VALID_ARCHS): \ + error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture") + single_arch: VALID_ARCHS = $$first(VALID_ARCHS) ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS)) diff --git a/mkspecs/features/uikit/sdk.prf b/mkspecs/features/uikit/sdk.prf index eb7cb52dae..287441c760 100644 --- a/mkspecs/features/uikit/sdk.prf +++ b/mkspecs/features/uikit/sdk.prf @@ -1,7 +1,4 @@ -build_pass:simulator: \ - QMAKE_MAC_SDK ~= s,^$${device.sdk},$${simulator.sdk}, - load(sdk) macx-xcode { -- cgit v1.2.3