diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2015-07-29 14:42:52 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2015-07-30 08:57:34 +0000 |
| commit | ffcb2e654e89f7f3e0d2e745a277af1cad28a42f (patch) | |
| tree | ce1b1abe3f1cc13cea65ccfca48ecc6826653f20 | |
| parent | 7d81d2a00da9368ef653bf8d0770b788150cade6 (diff) | |
| download | qt-creator-ffcb2e654e89f7f3e0d2e745a277af1cad28a42f.tar.gz | |
Qbs: generate correct architecture name for iOS armv7.
Task-number: QBS-839
Change-Id: I535992feb2dd4db9f30dc1458b4c6a156a26849f
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| -rw-r--r-- | src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index 3cd18a6a73..11e25e309f 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp @@ -190,6 +190,9 @@ QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplor default: 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)); |