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

qmakestep: add configuration paramenters for ios

Browse Source 
Change-Id: Id0e6eceea5344929e7d2804ebd8cb47684f7ffe8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Fawzi Mohamed
2013-11-01 13:11:06 +01:00
parent dae1427c7b
commit 7fd7c518ea
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,6 +157,7 @@ QString QMakeStep::allArguments(bool shorted)
/// ///
/// moreArguments, /// moreArguments,
/// -unix for Maemo /// -unix for Maemo
/// iphoneos/iphonesimulator for ios
/// QMAKE_VAR_QMLJSDEBUGGER_PATH /// QMAKE_VAR_QMLJSDEBUGGER_PATH
QStringList QMakeStep::deducedArguments() QStringList QMakeStep::deducedArguments()
{ {
@@ -175,11 +176,18 @@ QStringList QMakeStep::deducedArguments()
arguments << QLatin1String("CONFIG+=x86"); arguments << QLatin1String("CONFIG+=x86");
else if (targetAbi.wordWidth() == 64) else if (targetAbi.wordWidth() == 64)
arguments << QLatin1String("CONFIG+=x86_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) { } else if (targetAbi.architecture() == ProjectExplorer::Abi::PowerPCArchitecture) {
if (targetAbi.wordWidth() == 32) if (targetAbi.wordWidth() == 32)
arguments << QLatin1String("CONFIG+=ppc"); arguments << QLatin1String("CONFIG+=ppc");
else if (targetAbi.wordWidth() == 64) else if (targetAbi.wordWidth() == 64)
arguments << QLatin1String("CONFIG+=ppc64"); arguments << QLatin1String("CONFIG+=ppc64");
} else if (targetAbi.architecture() == ProjectExplorer::Abi::ArmArchitecture) {
arguments << QLatin1String("CONFIG+=iphoneos");
} }
} }