diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-01-20 09:59:27 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-01-20 09:59:27 +0100 |
| commit | bd5dae90ad30d92fdff76da0caef7c5824b42707 (patch) | |
| tree | 44ccd0ba09460e3df4bce5f7b0ff2e0cbd7d03e2 /src/plugins/qbsprojectmanager | |
| parent | 487df597f34b0e4ac3c847e18c57820adc20c7d3 (diff) | |
| parent | 07544d4e0721e1ddbed3d310e6d250333c2b1fb5 (diff) | |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
Change-Id: I5e424e34db619bb769c7abc1e8651b7b40210839
Diffstat (limited to 'src/plugins/qbsprojectmanager')
| -rw-r--r-- | src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index ba43dc05439..f930d1d7af7 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp @@ -293,13 +293,13 @@ QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplor data.insert("Android.ndk.ndkDir", ndkDir); } } - data.remove(QBS_ARCHITECTURES); - data.remove(QBS_ARCHITECTURE); QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(k); if (qtVersion) { + data.remove(QBS_ARCHITECTURES); + data.remove(QBS_ARCHITECTURE); QStringList abis; for (const auto &abi : qtVersion->qtAbis()) - abis << abi.param(); + abis << architecture(abi); if (abis.size() == 1) data.insert(QLatin1String(QBS_ARCHITECTURE), abis.first()); else |