diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-17 10:57:35 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-21 09:27:46 +0000 |
| commit | 431520f1508e92272171c214b087183e71d08ec5 (patch) | |
| tree | 587556744c2c363ef69c4c1eddf2e1895199e2a0 | |
| parent | 0ff9cb5c5b3e7e99b3d21373f485a21447f855c2 (diff) | |
simplify setup of exclusive builds
the simulator_and_device CONFIG flag is now gone. this also implies that
we can set the debug_and_release and build_all flags based on the same
condition.
Change-Id: I6203c4b7f64584c06739a9aad1fb7201f2a3628a
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| -rw-r--r-- | Tools/qmake/mkspecs/features/default_pre.prf | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf index 6bb52d05a..568e80a94 100644 --- a/Tools/qmake/mkspecs/features/default_pre.prf +++ b/Tools/qmake/mkspecs/features/default_pre.prf @@ -102,9 +102,7 @@ gcc:isEqual(QT_ARCH, "arm"): CONFIG -= use_gold_linker # Pick up Qt's defaults for debug/release/debug_and_release 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 + qtConfig(debug_and_release): CONFIG += debug_and_release build_all } FLEX = flex |