aboutsummaryrefslogtreecommitdiffstats
path: root/Plugins/DbAndroid/adbmanager.cpp
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2018-07-27 23:51:12 -0400
committerLibravatarUnit 193 <unit193@ubuntu.com>2018-07-27 23:51:12 -0400
commitfeda8a7db8d1d7c5439aa8f8feef7cc0dd2b59a0 (patch)
tree1e50f5f666f419143f510d5ded00fe2006b7bd85 /Plugins/DbAndroid/adbmanager.cpp
parentd9aa870e5d509cc7309ab82dd102a937ab58613a (diff)
New upstream version 3.2.1+dfsg1upstream/3.2.1+dfsg1
Diffstat (limited to 'Plugins/DbAndroid/adbmanager.cpp')
-rw-r--r--Plugins/DbAndroid/adbmanager.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/Plugins/DbAndroid/adbmanager.cpp b/Plugins/DbAndroid/adbmanager.cpp
index bbcf8fc..e182c72 100644
--- a/Plugins/DbAndroid/adbmanager.cpp
+++ b/Plugins/DbAndroid/adbmanager.cpp
@@ -148,7 +148,13 @@ QString AdbManager::findAdb()
return "adb.exe";
static_qstring(winAdbPath, "/../Android/sdk/platform-tools/adb.exe");
- for (const QString& path : QStandardPaths::standardLocations(QStandardPaths::AppLocalDataLocation))
+ for (const QString& path : QStandardPaths::standardLocations(
+#if QT_VERSION >= 0x050400
+ QStandardPaths::AppLocalDataLocation
+#else
+ QStandardPaths::GenericDataLocation
+#endif
+ ))
{
fullPath = QDir::cleanPath(path + winAdbPath);
if (testAdb(fullPath, true))