diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-20 13:22:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-20 13:23:35 +0200 |
| commit | 04d8ad739e2b248101aa20aa7135db45999c8810 (patch) | |
| tree | 109de1d8c64a239f5959456dcbc7aa041fff44ef | |
| parent | 95aa06166e47421f7595a2fe7f118035a77fac63 (diff) | |
| parent | 76e2732f013732461c09a1d6c6b4c77fcab1c0d0 (diff) | |
| download | qtwebkit-04d8ad739e2b248101aa20aa7135db45999c8810.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I2f90b96e6b59af71b3c7973345eb44e8213033d9
| -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 } |