feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

iOS: Qt 5.7 changed the CONFIG values for device vs simulator builds

Browse Source 
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 <tobias.hunger@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
This commit is contained in:
Eike Ziller
2016-04-18 16:47:04 +02:00
parent 00a7f3864b
commit aa4a0d8920
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -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");