From c44478f0fefc3e358ae1d7faf836f5eef3bb24dd Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 27 Sep 2021 23:21:19 +0200 Subject: [PATCH] Android: Fix FilePath usage (string vs. userInput/Output) Important on Windows Change-Id: I0a3041e28ad60f28544ecdab2f6153b7931939f2 Reviewed-by: Assam Boudjelthia --- src/plugins/android/androidsdkmanager.cpp | 2 +- src/plugins/android/androidsettingswidget.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp index 246b528f1e6..943e371178a 100644 --- a/src/plugins/android/androidsdkmanager.cpp +++ b/src/plugins/android/androidsdkmanager.cpp @@ -694,7 +694,7 @@ bool SdkManagerOutputParser::parseAbstractData(SdkManagerOutputParser::GenericPa for (const auto &key: qAsConst(keys)) { if (valueForKey(key, line, &value)) { if (key == installLocationKey) - output.installedLocation = Utils::FilePath::fromString(value); + output.installedLocation = Utils::FilePath::fromUserInput(value); else if (key == revisionKey) output.revision = QVersionNumber::fromString(value); else if (key == descriptionKey) diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index d67c53a9637..44fc69e92b9 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -241,7 +241,7 @@ void AndroidSettingsWidget::updateNdkList() const auto installedPkgs = m_sdkManager.installedNdkPackages(); for (const Ndk *ndk : installedPkgs) { m_ui.ndkListWidget->addItem(new QListWidgetItem(Icons::LOCKED.icon(), - ndk->installedLocation().toString())); + ndk->installedLocation().toUserOutput())); } const auto customNdks = m_androidConfig.getCustomNdkList();