Merge remote-tracking branch 'origin/4.13' into master

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
	src/plugins/cmakeprojectmanager/cmakebuildstep.h
	tests/auto/debugger/tst_namedemangler.cpp
	tests/auto/qml/codemodel/check/tst_check.cpp

Change-Id: Iefd5f71c03c0078513b76a92af764a4fb22ee4c2

src/plugins/qmakeprojectmanager/profilecompletionassist.cpp

@@ -208,6 +208,7 @@ const TextEditor::Keywords &QmakeProjectManager::Internal::qmakeKeywords()
                     "QMAKE_RUN_CXX_IMP",
                     "QMAKE_TARGET",
                     "QMAKE_UIC",
+                    "QOBJECT_REP",
                     "QT",
                     "QTPLUGIN",
                     "QT_MAJOR_VERSION",
@@ -216,6 +217,9 @@ const TextEditor::Keywords &QmakeProjectManager::Internal::qmakeKeywords()
                     "QT_VERSION",
                     "RCC_DIR",
                     "RC_FILE",
+                    "REPC_MERGED",
+                    "REPC_REPLICA",
+                    "REPC_SOURCE",
                     "REQUIRES",
                     "RESOURCES",
                     "RES_FILE",

src/plugins/qmakeprojectmanager/qmakenodes.cpp

@@ -360,6 +360,8 @@ QStringList QmakeProFileNode::targetApplications() const
 
 QVariant QmakeProFileNode::data(Utils::Id role) const
 {
+    if (role == Android::Constants::ANDROID_ABIS)
+        return variableValue(Variable::AndroidAbis);
     if (role == Android::Constants::AndroidPackageSourceDir)
         return singleVariableValue(Variable::AndroidPackageSourceDir);
     if (role == Android::Constants::AndroidDeploySettingsFile)
@@ -432,6 +434,8 @@ bool QmakeProFileNode::setData(Utils::Id role, const QVariant &value) const
         return pro->setProVariable("ANDROID_EXTRA_LIBS", value.toStringList(), scope, flags);
     if (role == Android::Constants::AndroidPackageSourceDir)
         return pro->setProVariable("ANDROID_PACKAGE_SOURCE_DIR", {value.toString()}, scope, flags);
+    if (role == Android::Constants::ANDROID_ABIS)
+        return pro->setProVariable("ANDROID_ABIS", {value.toStringList()}, scope, flags);
 
     return false;
 }

src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp

@@ -1589,6 +1589,7 @@ QmakeEvalResult *QmakeProFile::evaluate(const QmakeEvalInput &input)
         result->newVarValues[Variable::AndroidArch] = exactReader->values(QLatin1String("ANDROID_TARGET_ARCH"));
         result->newVarValues[Variable::AndroidDeploySettingsFile] = exactReader->values(QLatin1String("ANDROID_DEPLOYMENT_SETTINGS_FILE"));
         result->newVarValues[Variable::AndroidPackageSourceDir] = exactReader->values(QLatin1String("ANDROID_PACKAGE_SOURCE_DIR"));
+        result->newVarValues[Variable::AndroidAbis] = exactReader->values(QLatin1String("ANDROID_ABIS"));
         result->newVarValues[Variable::AndroidExtraLibs] = exactReader->values(QLatin1String("ANDROID_EXTRA_LIBS"));
         result->newVarValues[Variable::AppmanPackageDir] = exactReader->values(QLatin1String("AM_PACKAGE_DIR"));
         result->newVarValues[Variable::AppmanManifest] = exactReader->values(QLatin1String("AM_MANIFEST"));

src/plugins/qmakeprojectmanager/qmakeparsernodes.h

@@ -98,6 +98,7 @@ enum class Variable {
     ShLibExtension,
     AndroidArch,
     AndroidDeploySettingsFile,
+    AndroidAbis,
     AndroidPackageSourceDir,
     AndroidExtraLibs,
     AppmanPackageDir,

src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp

@@ -435,7 +435,7 @@ void QmakeProjectManagerPluginPrivate::runQMakeImpl(Project *p, Node *node)
         if (auto *profile = dynamic_cast<QmakeProFileNode *>(node))
             bc->setSubNodeBuild(profile);
 
-    BuildManager::appendStep(qs, tr("QMake"));
+    BuildManager::appendStep(qs, QmakeProjectManagerPlugin::tr("QMake"));
     bc->setSubNodeBuild(nullptr);
 }
 

src/plugins/qmakeprojectmanager/qmakestep.cpp

@@ -34,6 +34,8 @@
 #include "qmakeprojectmanagerconstants.h"
 #include "qmakesettings.h"
 
+#include <android/androidconstants.h>
+
 #include <projectexplorer/buildmanager.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/gnumakeparser.h>
@@ -664,8 +666,12 @@ void QMakeStepConfigWidget::abisChanged()
                 break;
             }
         }
-        args << prefix + '"' + abis.join(' ') + '"';
+        if (!abis.isEmpty())
+            args << prefix + '"' + abis.join(' ') + '"';
         m_step->setExtraArguments(args);
+
+        const QString buildKey = m_step->target()->activeBuildKey();
+        m_step->buildSystem()->setExtraData(buildKey, Android::Constants::ANDROID_ABIS, m_step->selectedAbis());
     }
 
     updateSummaryLabel();
@@ -743,12 +749,12 @@ void QMakeStepConfigWidget::updateSummaryLabel()
         if (selectedAbis.isEmpty() && isAndroidKit()) {
             // Prefer ARM for Android, prefer 32bit.
             for (const Abi &abi : abis) {
-                if (abi.param() == "armeabi-v7a")
+                if (abi.param() == ProjectExplorer::Constants::ANDROID_ABI_ARMEABI_V7A)
                     selectedAbis.append(abi.param());
             }
             if (selectedAbis.isEmpty()) {
                 for (const Abi &abi : abis) {
-                    if (abi.param() == "arm64-v8a")
+                    if (abi.param() == ProjectExplorer::Constants::ANDROID_ABI_ARM64_V8A)
                         selectedAbis.append(abi.param());
                 }
             }