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 --- mkspecs/features/qt_plugin.prf | 1 - 1 file changed, 1 deletion(-) (limited to 'mkspecs/features/qt_plugin.prf') 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 } -- cgit v1.2.3