Merge tag 'upstream/3.1.1+dfsg1'

Upstream version 3.1.1+dfsg1

# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg:                using RSA key 5001E1B09AA3744B
# gpg:                issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg:                 aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18  5A5C 5001 E1B0 9AA3 744B

1 files changed, 9 insertions, 1 deletions

diff --git a/Plugins/DbAndroid/adbmanager.cpp b/Plugins/DbAndroid/adbmanager.cpp
index 462e91f..bbcf8fc 100644
--- a/Plugins/DbAndroid/adbmanager.cpp
+++ b/Plugins/DbAndroid/adbmanager.cpp
@@ -135,12 +135,19 @@ QString AdbManager::findAdb()
     }
 #endif
 
+    QString fullPath;
+    for (const QString& path : candidates)
+    {
+        fullPath = QDir::cleanPath(path);
+        if (testAdb(fullPath, true))
+            return fullPath;
+    }
+
 #ifdef Q_OS_WIN32
     if (testAdb("adb.exe", true))
         return "adb.exe";
 
     static_qstring(winAdbPath, "/../Android/sdk/platform-tools/adb.exe");
-    QString fullPath;
     for (const QString& path : QStandardPaths::standardLocations(QStandardPaths::AppLocalDataLocation))
     {
         fullPath = QDir::cleanPath(path + winAdbPath);
@@ -286,6 +293,7 @@ bool AdbManager::execLongCommand(const QStringList& arguments, QProcess& proc, Q
     // Take off initial arguments from ADB, store it to use with "push".
     QStringList primaryArguments;
     QStringList args = arguments;
+
     while (args.first() != "shell")
         primaryArguments << args.takeFirst();