diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-04-18 16:47:04 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-04-18 15:10:05 +0000 |
| commit | aa4a0d8920d47f3f3c18436c7c81f1ed3bca244b (patch) | |
| tree | a82781337744a80838f0b35449681db2bb02b2d0 | |
| parent | 00a7f3864b59f1488634bacd78b1d1c071c87bd9 (diff) | |
iOS: Qt 5.7 changed the CONFIG values for device vs simulator buildsv4.0.0-rc1
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>
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakestep.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 1a7906cff7..8c00e092bc 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"); |