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

qbs: fix ios profiles

Browse Source 
Task-number: QBS-427
Change-Id: I2ad69076ba8fe4c989f6909b77087c94def683cb
Reviewed-by: Ivan Komissarov <ABBAPOH@me.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Fawzi Mohamed
2013-12-04 18:53:19 +01:00
parent 50f2d91b44
commit 925ace38ea
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
View File

@@ -95,9 +95,19 @@ QVariantMap DefaultPropertyProvider::properties(const ProjectExplorer::Kit *k, c
? QStringList() << QLatin1String("mingw") << QLatin1String("gcc") ? QStringList() << QLatin1String("mingw") << QLatin1String("gcc")
: QStringList() << QLatin1String("msvc")); : QStringList() << QLatin1String("msvc"));
} else if (targetAbi.os() == ProjectExplorer::Abi::MacOS) { } else if (targetAbi.os() == ProjectExplorer::Abi::MacOS) {
data.insert(QLatin1String(QBS_TARGETOS), QStringList() << QLatin1String("osx") const char IOSQT[] = "Qt4ProjectManager.QtVersion.Ios"; // from Ios::Constants (include header?)
<< QLatin1String("darwin") << QLatin1String("bsd4") if (qt && qt->type() == QLatin1String(IOSQT)) {
<< QLatin1String("bsd") << QLatin1String("unix")); QStringList targetOS;
if (targetAbi.architecture() == ProjectExplorer::Abi::X86Architecture)
targetOS << QLatin1String("ios-simulator");
targetOS << QLatin1String("ios") << QLatin1String("darwin")
<< QLatin1String("bsd4") << QLatin1String("bsd") << QLatin1String("unix");
data.insert(QLatin1String(QBS_TARGETOS), targetOS);
} else {
data.insert(QLatin1String(QBS_TARGETOS), QStringList() << QLatin1String("osx")
<< QLatin1String("darwin") << QLatin1String("bsd4")
<< QLatin1String("bsd") << QLatin1String("unix"));
}
if (tc->type() != QLatin1String("clang")) { if (tc->type() != QLatin1String("clang")) {
data.insert(QLatin1String(QBS_TOOLCHAIN), QLatin1String("gcc")); data.insert(QLatin1String(QBS_TOOLCHAIN), QLatin1String("gcc"));
} else { } else {