Android: Use macro-expanded file paths in settings

Change-Id: I3db9fc6cc4e7da1c31579aff0e1e5b81a8f4ff94
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index 9b1848cba8..4e57b1868b 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -594,7 +594,7 @@ void AndroidSettingsWidget::validateOpenSsl()
 
 void AndroidSettingsWidget::onSdkPathChanged()
 {
-    auto sdkPath = FilePath::fromUserInput(m_ui.SDKLocationPathChooser->rawPath());
+    const FilePath sdkPath = m_ui.SDKLocationPathChooser->filePath();
     m_androidConfig.setSdkLocation(sdkPath);
     FilePath currentOpenSslPath = m_androidConfig.openSslLocation();
     if (currentOpenSslPath.isEmpty() || !currentOpenSslPath.exists())
@@ -606,7 +606,7 @@ void AndroidSettingsWidget::onSdkPathChanged()
 
 void AndroidSettingsWidget::validateSdk()
 {
-    auto sdkPath = FilePath::fromUserInput(m_ui.SDKLocationPathChooser->rawPath());
+    const FilePath sdkPath = m_ui.SDKLocationPathChooser->filePath();
     m_androidConfig.setSdkLocation(sdkPath);
 
     m_androidSummary->setPointValid(SdkPathExistsRow, m_androidConfig.sdkLocation().exists());
@@ -865,12 +865,12 @@ void AndroidSettingsWidget::downloadSdk()
     }
 
     const QString message = tr("Download and install Android SDK Tools to: %1?")
-                        .arg(QDir::toNativeSeparators(m_ui.SDKLocationPathChooser->rawPath()));
+                        .arg(m_ui.SDKLocationPathChooser->filePath().toUserOutput());
     auto userInput = QMessageBox::information(this, AndroidSdkDownloader::dialogTitle(),
                                               message, QMessageBox::Yes | QMessageBox::No);
     if (userInput == QMessageBox::Yes) {
         if (m_javaSummary->allRowsOk()) {
-            auto javaPath = FilePath::fromUserInput(m_ui.OpenJDKLocationPathChooser->rawPath());
+            auto javaPath = m_ui.OpenJDKLocationPathChooser->filePath();
             m_sdkDownloader.downloadAndExtractSdk(javaPath.toString(),
                                                   m_ui.SDKLocationPathChooser->filePath().toString());
         }