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

Qbs: generate correct architecture name for iOS armv7.

Browse Source 
Task-number: QBS-839
Change-Id: I535992feb2dd4db9f30dc1458b4c6a156a26849f
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
Jake Petroules
2015-07-29 14:42:52 -07:00
parent 7d81d2a00d
commit ffcb2e654e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,6 +190,9 @@ QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplor
default: default:
break; break;
} }
} else if (targetAbi.architecture() == ProjectExplorer::Abi::ArmArchitecture &&
targetAbi.os() == ProjectExplorer::Abi::MacOS) {
architecture.append(QLatin1String("v7"));
} }
data.insert(QLatin1String(QBS_ARCHITECTURE), qbs::canonicalArchitecture(architecture)); data.insert(QLatin1String(QBS_ARCHITECTURE), qbs::canonicalArchitecture(architecture));