Merge remote-tracking branch 'origin/4.11'

Conflicts:
	src/plugins/autotest/testresultspane.cpp
	src/plugins/cmakeprojectmanager/cmaketool.cpp

Change-Id: Iade695ac9cab8bf3e3a1abd6e2c71f4a19132ac0

src/plugins/android/androidconfigurations.cpp

@@ -870,6 +870,7 @@ FilePath AndroidConfig::qtLiveApkPath() const
 ///////////////////////////////////
 void AndroidConfigurations::setConfig(const AndroidConfig &devConfigs)
 {
+    emit m_instance->aboutToUpdate();
     m_instance->m_config = devConfigs;
 
     m_instance->save();

src/plugins/android/androidconfigurations.h

@@ -209,6 +209,7 @@ public:
     static QProcessEnvironment toolsEnvironment(const AndroidConfig &config);
 
 signals:
+    void aboutToUpdate();
     void updated();
 
 private:

src/plugins/android/androidmanager.cpp

@@ -288,8 +288,8 @@ QJsonObject AndroidManager::deploymentSettings(const Target *target)
 
 Utils::FilePath AndroidManager::dirPath(const ProjectExplorer::Target *target)
 {
-    if (target->activeBuildConfiguration())
-        return target->activeBuildConfiguration()->buildDirectory().pathAppended(Constants::ANDROID_BUILDDIRECTORY);
+    if (auto *bc = target->activeBuildConfiguration())
+        return bc->buildDirectory().pathAppended(Constants::ANDROID_BUILDDIRECTORY);
     return Utils::FilePath();
 }
 

src/plugins/android/androidqtversion.cpp

@@ -49,7 +49,12 @@ namespace Internal {
 
 AndroidQtVersion::AndroidQtVersion()
     : QtSupport::BaseQtVersion()
+    , m_guard(std::make_unique<QObject>())
 {
+    QObject::connect(AndroidConfigurations::instance(),
+                     &AndroidConfigurations::aboutToUpdate,
+                     m_guard.get(),
+                     [this] { resetCache(); });
 }
 
 bool AndroidQtVersion::isValid() const

src/plugins/android/androidqtversion.h

@@ -58,6 +58,7 @@ public:
 protected:
     void parseMkSpec(ProFileEvaluator *) const override;
 private:
+    std::unique_ptr<QObject> m_guard;
     mutable QStringList m_androidAbis;
     mutable int m_minNdk = -1;
 };

src/plugins/android/androidrunnerworker.cpp

@@ -67,7 +67,7 @@ using namespace Utils;
 namespace Android {
 namespace Internal {
 
-static const QString pidScript = "pidof -s \"%1\"";
+static const QString pidScript = "pidof -s '%1'";
 static const QString pidScriptPreNougat = QStringLiteral("for p in /proc/[0-9]*; "
                                                 "do cat <$p/cmdline && echo :${p##*/}; done");
 static const QString pidPollingScript = QStringLiteral("while [ -d /proc/%1 ]; do sleep 1; done");
@@ -288,8 +288,8 @@ bool AndroidRunnerWorker::uploadGdbServer()
         qCDebug(androidRunWorkerLog) << "Gdbserver copy from temp directory failed";
         return false;
     }
-    QTC_ASSERT(runAdb({"shell", "run-as", m_packageName, "chmod", "+x", "./gdbserver"}),
-                   qCDebug(androidRunWorkerLog) << "Gdbserver chmod +x failed.");
+    QTC_ASSERT(runAdb({"shell", "run-as", m_packageName, "chmod", "777", "./gdbserver"}),
+                   qCDebug(androidRunWorkerLog) << "Gdbserver chmod 777 failed.");
     return true;
 }