From ffcb2e654e89f7f3e0d2e745a277af1cad28a42f Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Wed, 29 Jul 2015 14:42:52 -0700 Subject: [PATCH] Qbs: generate correct architecture name for iOS armv7. Task-number: QBS-839 Change-Id: I535992feb2dd4db9f30dc1458b4c6a156a26849f Reviewed-by: Christian Kandeler --- src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index 3cd18a6a73c..11e25e309f1 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));