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 --- examples/widgets/tools/plugandpaint/plugins/basictools/basictools.pro | 2 +- .../widgets/tools/plugandpaint/plugins/extrafilters/extrafilters.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'examples/widgets/tools/plugandpaint') 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 -- cgit v1.2.3