diff options
| author | hjk <[email protected]> | 2019-05-20 17:13:51 +0200 |
|---|---|---|
| committer | hjk <[email protected]> | 2019-05-27 09:10:19 +0000 |
| commit | dc9cbd8f57eca84e955b95fd79e4a64b7453cacc (patch) | |
| tree | 0f42191c85f8dd683a497c06762bd30649029548 /src/plugins/android/androidtoolmanager.cpp | |
| parent | 061896a1480b4edea47d2f8cbdfc11e6484f8154 (diff) | |
More FileName::appendPath() -> .pathAppended() changes
Change-Id: Ibc7eb4eb3ffb64658e441aafa240b1ddc0061930
Reviewed-by: Eike Ziller <[email protected]>
Diffstat (limited to 'src/plugins/android/androidtoolmanager.cpp')
| -rw-r--r-- | src/plugins/android/androidtoolmanager.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/plugins/android/androidtoolmanager.cpp b/src/plugins/android/androidtoolmanager.cpp index b5471457724..84658f12b2f 100644 --- a/src/plugins/android/androidtoolmanager.cpp +++ b/src/plugins/android/androidtoolmanager.cpp @@ -244,9 +244,8 @@ AndroidDeviceInfoList AndroidToolManager::androidVirtualDevices(const Utils::Fil if (lastIndex == -1) // skip line break; QString tmp = line.mid(lastIndex).remove(QLatin1Char(')')).trimmed(); - Utils::FileName platformPath = sdkLocationPath; - platformPath.appendPath(QString("/platforms/android-%1").arg(tmp)); - dev.sdk = AndroidManager::findApiLevel(platformPath); + dev.sdk = AndroidManager::findApiLevel( + sdkLocationPath.pathAppended(QString("/platforms/android-%1").arg(tmp))); } if (line.contains(QLatin1String("Tag/ABI:"))) { int lastIndex = line.lastIndexOf(QLatin1Char('/')) + 1; @@ -312,10 +311,8 @@ void AndroidToolOutputParser::parseTargetListing(const QString &output, continue; QString androidTarget = line.mid(index + 1, line.length() - index - 2); const QString tmp = androidTarget.mid(androidTarget.lastIndexOf(QLatin1Char('-')) + 1); - Utils::FileName platformPath = sdkLocation; - platformPath.appendPath(QString("/platforms/android-%1").arg(tmp)); - platformParams.installedLocation = platformPath; - platformParams.apiLevel = AndroidManager::findApiLevel(platformPath); + platformParams.installedLocation = sdkLocation.pathAppended(QString("/platforms/android-%1").arg(tmp)); + platformParams.apiLevel = AndroidManager::findApiLevel(platformParams.installedLocation); } else if (line.startsWith(QLatin1String("Name:"))) { platformParams.description = line.mid(6); } else if (line.startsWith(QLatin1String("Revision:"))) { |