diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-12-06 13:04:17 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-12-07 18:39:54 +0200 |
| commit | 49f6b0146a520e61477aacdf8d1f4e7048f569dd (patch) | |
| tree | 1bc5b9a7f72bfe25b70109190b018c6549403813 /src/plugins/qmakeprojectmanager | |
| parent | 3c41b91d44838fcadfa50c4044e338d43a27cc10 (diff) | |
| parent | 9eed77fe86ed91b08d4f9dc23d3534eeb3dfff6a (diff) | |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/plugins/mcusupport/mcusupportrunconfiguration.cpp
src/plugins/python/pythonproject.cpp
src/plugins/qmakeprojectmanager/qmakestep.cpp
src/plugins/qmlprojectmanager/qmlproject.cpp
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
Change-Id: I22507be28fd80c49c9fee0dff5937a40db176a82
Diffstat (limited to 'src/plugins/qmakeprojectmanager')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakenodes.cpp | 18 | ||||
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakestep.cpp | 4 |
2 files changed, 15 insertions, 7 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index a75224f1ed6..4b631a9e4b8 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -32,6 +32,9 @@ #include <projectexplorer/runconfiguration.h> #include <projectexplorer/target.h> +#include <qtsupport/baseqtversion.h> +#include <qtsupport/qtkitinformation.h> + #include <resourceeditor/resourcenode.h> #include <utils/qtcassert.h> @@ -409,11 +412,16 @@ bool QmakeProFileNode::setData(Core::Id role, const QVariant &value) const QmakeProFile *pro = proFile(); if (!pro) return false; - - const QString arch = pro->singleVariableValue(Variable::AndroidArch); - const QString scope = "contains(ANDROID_TARGET_ARCH," + arch + ')'; - auto flags = QmakeProjectManager::Internal::ProWriter::ReplaceValues - | QmakeProjectManager::Internal::ProWriter::MultiLine; + QString scope; + int flags = QmakeProjectManager::Internal::ProWriter::ReplaceValues; + if (Target *target = m_buildSystem->target()) { + QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(target->kit()); + if (version && version->qtVersion() < QtSupport::QtVersionNumber(5, 14, 0)) { + const QString arch = pro->singleVariableValue(Variable::AndroidArch); + scope = "contains(ANDROID_TARGET_ARCH," + arch + ')'; + flags |= QmakeProjectManager::Internal::ProWriter::MultiLine; + } + } if (role == Android::Constants::AndroidExtraLibs) return pro->setProVariable("ANDROID_EXTRA_LIBS", value.toStringList(), scope, flags); diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 1c441cc0cd3..5f2b6242223 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -722,8 +722,8 @@ void QMakeStepConfigWidget::updateSummaryLabel() item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable); item->setCheckState(Qt::Unchecked); isAndroid = isAndroid && abi.osFlavor() == Abi::OSFlavor::AndroidLinuxFlavor; - if (isAndroid && (item->text() == "arm64-v8a" || - (m_preferredAbiIndex == -1 && item->text() == "armeabi-v7a"))) { + if (isAndroid && (item->text() == "armeabi-v7a" || + (m_preferredAbiIndex == -1 && item->text() == "arm64-v8a"))) { m_preferredAbiIndex = abisListWidget->count() - 1; } } |