From 76e2732f013732461c09a1d6c6b4c77fcab1c0d0 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 17 Jun 2016 11:31:59 +0200 Subject: 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 --- Tools/qmake/mkspecs/features/default_pre.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 } -- cgit v1.2.3