diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2018-07-27 23:54:15 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2018-07-27 23:54:15 -0400 |
| commit | 6d3d39356473078c6b47e03b8a7616e4b34de928 (patch) | |
| tree | fe5be2e6a08e4cfc73207746aba4c9fccfecfa10 /Plugins/DbAndroid/adbmanager.cpp | |
| parent | f98e49169a40876bcf1df832de6e908d1b350193 (diff) | |
| parent | feda8a7db8d1d7c5439aa8f8feef7cc0dd2b59a0 (diff) | |
Update upstream source from tag 'upstream/3.2.1+dfsg1'
Update to upstream version '3.2.1+dfsg1'
with Debian dir 5ea0333565de4dc898c062cc0ff4ba1153e2c1e4
Diffstat (limited to 'Plugins/DbAndroid/adbmanager.cpp')
| -rw-r--r-- | Plugins/DbAndroid/adbmanager.cpp | 8 |
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)) |