diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-23 18:36:13 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-23 18:08:51 +0000 |
| commit | 416ad2e2a9f541e2ea27103745ec8f2b45acd54f (patch) | |
| tree | 9296b55f9521b9714bc7240ae0cf6d3f800bd3c8 | |
| parent | f1b22ccfb78cc9d18d707e6d6a24a5951c60ffa5 (diff) | |
| download | qtwebkit-416ad2e2a9f541e2ea27103745ec8f2b45acd54f.tar.gz | |
fix ios device&simulator builds again
the assumption stated in c48fd0cb is actually invalid - configure sets
build_all without debug_and_release there. debug_and_release does
actually imply build_all, though.
to make things less confusing, don't let configure inject
iphonesimulator_and_iphoneos into all projects, but handle it like
debug_and_release instead.
Change-Id: I05258d4a88549608c26d8b3dd9618f5736ff7ce3
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| -rw-r--r-- | Tools/qmake/mkspecs/features/default_pre.prf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf index b07481629..3e6677c92 100644 --- a/Tools/qmake/mkspecs/features/default_pre.prf +++ b/Tools/qmake/mkspecs/features/default_pre.prf @@ -102,7 +102,9 @@ 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 { - contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release build_all + contains(QT_CONFIG, simulator_and_device): CONFIG += iphonesimulator_and_iphoneos + contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release + contains(QT_CONFIG, build_all): CONFIG += build_all } FLEX = flex |