feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Fix FilePath usage (string vs. userInput/Output)

Browse Source 
Important on Windows

Change-Id: I0a3041e28ad60f28544ecdab2f6153b7931939f2
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Alessandro Portale
2021-09-27 23:21:19 +02:00
parent 67a8cfb62a
commit c44478f0fe
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidsdkmanager.cpp
View File

@@ -694,7 +694,7 @@ bool SdkManagerOutputParser::parseAbstractData(SdkManagerOutputParser::GenericPa
for (const auto &key: qAsConst(keys)) { for (const auto &key: qAsConst(keys)) {
if (valueForKey(key, line, &value)) { if (valueForKey(key, line, &value)) {
if (key == installLocationKey) if (key == installLocationKey)
output.installedLocation = Utils::FilePath::fromString(value); output.installedLocation = Utils::FilePath::fromUserInput(value);
else if (key == revisionKey) else if (key == revisionKey)
output.revision = QVersionNumber::fromString(value); output.revision = QVersionNumber::fromString(value);
else if (key == descriptionKey) else if (key == descriptionKey)

2
src/plugins/android/androidsettingswidget.cpp
View File

@@ -241,7 +241,7 @@ void AndroidSettingsWidget::updateNdkList()
const auto installedPkgs = m_sdkManager.installedNdkPackages(); const auto installedPkgs = m_sdkManager.installedNdkPackages();
for (const Ndk *ndk : installedPkgs) { for (const Ndk *ndk : installedPkgs) {
m_ui.ndkListWidget->addItem(new QListWidgetItem(Icons::LOCKED.icon(), m_ui.ndkListWidget->addItem(new QListWidgetItem(Icons::LOCKED.icon(),
ndk->installedLocation().toString())); ndk->installedLocation().toUserOutput()));
} }
const auto customNdks = m_androidConfig.getCustomNdkList(); const auto customNdks = m_androidConfig.getCustomNdkList();