diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-06-17 11:31:59 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-06-17 09:38:10 +0000 |
| commit | 76e2732f013732461c09a1d6c6b4c77fcab1c0d0 (patch) | |
| tree | bca9b5826ef14054c4d3312f4391c9cb3784fbff | |
| parent | 8b24887dcb8e9ea1fd1b4043795a54bb3d6d3663 (diff) | |
| download | qtwebkit-76e2732f013732461c09a1d6c6b4c77fcab1c0d0.tar.gz | |
fix logical mismerge from 5.6
iphonesimulator_and_iphoneos was renamed to simulator_and_device in 5.7.
Change-Id: If24f96a7404048129db91b42d519e85ce418db07
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | Tools/qmake/mkspecs/features/default_pre.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf index 3e6677c92..221937e85 100644 --- a/Tools/qmake/mkspecs/features/default_pre.prf +++ b/Tools/qmake/mkspecs/features/default_pre.prf @@ -102,7 +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 { - contains(QT_CONFIG, simulator_and_device): CONFIG += iphonesimulator_and_iphoneos + contains(QT_CONFIG, simulator_and_device): CONFIG += simulator_and_device contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release contains(QT_CONFIG, build_all): CONFIG += build_all } |