diff options
Diffstat (limited to 'src/plugins/android/androidtoolmanager.cpp')
| -rw-r--r-- | src/plugins/android/androidtoolmanager.cpp | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/plugins/android/androidtoolmanager.cpp b/src/plugins/android/androidtoolmanager.cpp index b547145772..be26329f98 100644 --- a/src/plugins/android/androidtoolmanager.cpp +++ b/src/plugins/android/androidtoolmanager.cpp @@ -46,7 +46,7 @@ using namespace Utils; class AndroidToolOutputParser { public: - void parseTargetListing(const QString &output, const FileName &sdkLocation, + void parseTargetListing(const QString &output, const FilePath &sdkLocation, SdkPlatformList &platformList); QList<SdkPlatform> m_installedPlatforms; @@ -57,7 +57,7 @@ public: environment. Returns \c true for successful execution. Command's output is copied to \a output. */ -static bool androidToolCommand(Utils::FileName toolPath, const QStringList &args, +static bool androidToolCommand(Utils::FilePath toolPath, const QStringList &args, const QProcessEnvironment &environment, QString *output) { QString androidToolPath = toolPath.toString(); @@ -143,7 +143,7 @@ QFuture<AndroidDeviceInfoList> AndroidToolManager::androidVirtualDevicesFuture() AndroidConfigurations::toolsEnvironment(m_config)); } -CreateAvdInfo AndroidToolManager::createAvdImpl(CreateAvdInfo info, FileName androidToolPath, +CreateAvdInfo AndroidToolManager::createAvdImpl(CreateAvdInfo info, FilePath androidToolPath, QProcessEnvironment env) { QProcess proc; @@ -195,8 +195,8 @@ CreateAvdInfo AndroidToolManager::createAvdImpl(CreateAvdInfo info, FileName and return info; } -AndroidDeviceInfoList AndroidToolManager::androidVirtualDevices(const Utils::FileName &androidTool, - const FileName &sdkLocationPath, +AndroidDeviceInfoList AndroidToolManager::androidVirtualDevices(const Utils::FilePath &androidTool, + const FilePath &sdkLocationPath, const QProcessEnvironment &env) { AndroidDeviceInfoList devices; @@ -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; @@ -275,7 +274,7 @@ AndroidDeviceInfoList AndroidToolManager::androidVirtualDevices(const Utils::Fil } void AndroidToolOutputParser::parseTargetListing(const QString &output, - const Utils::FileName &sdkLocation, + const Utils::FilePath &sdkLocation, SdkPlatformList &platformList) { auto addSystemImage = [](const QStringList& abiList, SdkPlatform *platform) { @@ -292,7 +291,7 @@ void AndroidToolOutputParser::parseTargetListing(const QString &output, QVersionNumber revision; int apiLevel = -1; QString description; - Utils::FileName installedLocation; + Utils::FilePath installedLocation; void clear() { abiList.clear(); @@ -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:"))) { |