From dad7deccc4741bb6596d0f2a84d64bffd392a1b3 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Wed, 17 Nov 2021 10:03:50 +0100
Subject: [PATCH] QmlProject: Use fromUserInput for settings

Change-Id: Ib591c703e8badc2f12337680a788c051e1a7d974
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 src/plugins/qmlprojectmanager/qmlprojectplugin.cpp | 8 ++++----
 src/plugins/qmlprojectmanager/qmlprojectplugin.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
index 1faf0ccbaab..7552e6cd6d3 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
@@ -91,7 +91,7 @@ QmlProjectPlugin::~QmlProjectPlugin()
 
 void QmlProjectPlugin::openQDS(const Utils::FilePath &fileName)
 {
-    const QString &qdsPath = QmlProjectPlugin::qdsInstallationEntry();
+    const QString &qdsPath = QmlProjectPlugin::qdsInstallationEntry().toString();
     bool qdsStarted = false;
     //-a and -client arguments help to append project to open design studio application
     if (Utils::HostOsInfo::isMacHost())
@@ -106,17 +106,17 @@ void QmlProjectPlugin::openQDS(const Utils::FilePath &fileName)
     }
 }
 
-QString QmlProjectPlugin::qdsInstallationEntry()
+Utils::FilePath QmlProjectPlugin::qdsInstallationEntry()
 {
     QSettings *settings = Core::ICore::settings();
     const QString qdsInstallationEntry = "QML/Designer/DesignStudioInstallation"; //set in installer
 
-    return settings->value(qdsInstallationEntry).toString();
+    return Utils::FilePath::fromUserInput(settings->value(qdsInstallationEntry).toString());
 }
 
 bool QmlProjectPlugin::qdsInstallationExists()
 {
-    return Utils::FilePath::fromString(qdsInstallationEntry()).exists();
+    return qdsInstallationEntry().exists();
 }
 
 Utils::FilePath findQmlProject(const Utils::FilePath &folder)
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.h b/src/plugins/qmlprojectmanager/qmlprojectplugin.h
index 260512c5df3..92df42532cb 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectplugin.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.h
@@ -41,7 +41,7 @@ public:
     ~QmlProjectPlugin() final;
 
     static void openQDS(const Utils::FilePath &fileName);
-    static QString qdsInstallationEntry();
+    static Utils::FilePath qdsInstallationEntry();
     static bool qdsInstallationExists();
 
 private: