diff options
| author | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2013-11-01 13:11:06 +0100 |
|---|---|---|
| committer | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2013-11-01 19:08:09 +0100 |
| commit | 7fd7c518ea38920d28c9639ecfe4643501c0d078 (patch) | |
| tree | e4692b228c890e0e123d0dbf27f75361a01cfd58 /src/plugins/qmakeprojectmanager/qmakestep.cpp | |
| parent | dae1427c7bc06bfcb08950b45f0e9cb5efacecdd (diff) | |
| download | qt-creator-7fd7c518ea38920d28c9639ecfe4643501c0d078.tar.gz | |
qmakestep: add configuration paramenters for ios
Change-Id: Id0e6eceea5344929e7d2804ebd8cb47684f7ffe8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/qmakeprojectmanager/qmakestep.cpp')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakestep.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 397eef5a38..81efeff72a 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -157,6 +157,7 @@ QString QMakeStep::allArguments(bool shorted) /// /// moreArguments, /// -unix for Maemo +/// iphoneos/iphonesimulator for ios /// QMAKE_VAR_QMLJSDEBUGGER_PATH QStringList QMakeStep::deducedArguments() { @@ -175,11 +176,18 @@ QStringList QMakeStep::deducedArguments() arguments << QLatin1String("CONFIG+=x86"); else if (targetAbi.wordWidth() == 64) arguments << QLatin1String("CONFIG+=x86_64"); + + const char IOSQT[] = "Qt4ProjectManager.QtVersion.Ios"; // from Ios::Constants (include header?) + QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit()); + if (version && version->type() == QLatin1String(IOSQT)) + arguments << QLatin1String("CONFIG+=iphonesimulator"); } else if (targetAbi.architecture() == ProjectExplorer::Abi::PowerPCArchitecture) { if (targetAbi.wordWidth() == 32) arguments << QLatin1String("CONFIG+=ppc"); else if (targetAbi.wordWidth() == 64) arguments << QLatin1String("CONFIG+=ppc64"); + } else if (targetAbi.architecture() == ProjectExplorer::Abi::ArmArchitecture) { + arguments << QLatin1String("CONFIG+=iphoneos"); } } |