From aa4a0d8920d47f3f3c18436c7c81f1ed3bca244b Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 18 Apr 2016 16:47:04 +0200 Subject: [PATCH] iOS: Qt 5.7 changed the CONFIG values for device vs simulator builds This is a quick fix, just adding the new values. It would be nicer to make them depend on the actual Qt version, but that seems to be a bit more involved. Task-number: QTCREATORBUG-16102 Change-Id: I2dbd0e76f90e7aeabb0c354fe54a6a0eb041454e Reviewed-by: Tobias Hunger Reviewed-by: Vikas Pachdha --- src/plugins/qmakeprojectmanager/qmakestep.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 1a7906cff7c..8c00e092bce 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -843,10 +843,11 @@ QStringList QMakeStepConfig::toArguments() const else if (archConfig == PPC64) arguments << QLatin1String("CONFIG+=ppc64"); + // TODO: make that depend on the actual Qt version that is used if (osType == IphoneSimulator) - arguments << QLatin1String("CONFIG+=iphonesimulator"); + arguments << QLatin1String("CONFIG+=iphonesimulator") << QLatin1String("CONFIG+=simulator") /*since Qt 5.7*/; else if (osType == IphoneOS) - arguments << QLatin1String("CONFIG+=iphoneos"); + arguments << QLatin1String("CONFIG+=iphoneos") << QLatin1String("CONFIG+=device") /*since Qt 5.7*/; if (linkQmlDebuggingQQ2) arguments << QLatin1String("CONFIG+=qml_debug");