From c4a7a646d92f1600eae44fb7cc93a6dea157fbac Mon Sep 17 00:00:00 2001
From: Bernd Weimer <bernd.weimer@pelagicore.com>
Date: Tue, 28 Apr 2020 09:11:22 +0200
Subject: Fix QuicklaunchQml path evaluation again

Code was broken by a merge from 5.13 (2887a8c)

Change-Id: I4f87bd07a047483f4fb3e6758186229dceabd1e0
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
---
 src/tools/launcher-qml/launcher-qml.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/tools/launcher-qml/launcher-qml.cpp b/src/tools/launcher-qml/launcher-qml.cpp
index 0e533e10..46143dc2 100644
--- a/src/tools/launcher-qml/launcher-qml.cpp
+++ b/src/tools/launcher-qml/launcher-qml.cpp
@@ -327,12 +327,9 @@ Controller::Controller(LauncherMain *launcher, bool quickLaunched, const QPair<Q
         }, Qt::QueuedConnection);
     }
 
-    QString quicklaunchQml = m_configuration.value((qSL("quicklaunchQml"))).toString();
+    const QString quicklaunchQml = m_configuration.value((qSL("quicklaunchQml"))).toString();
     if (!quicklaunchQml.isEmpty() && quickLaunched) {
-        if (QFileInfo(quicklaunchQml).isRelative())
-            quicklaunchQml.prepend(launcher->baseDir());
-
-        QQmlComponent quicklaunchComp(&m_engine, quicklaunchQml);
+        QQmlComponent quicklaunchComp(&m_engine, filePathToUrl(quicklaunchQml, launcher->baseDir()));
         if (!quicklaunchComp.isError()) {
             QScopedPointer<QObject> quicklaunchInstance(quicklaunchComp.create());
         } else {
@@ -493,7 +490,7 @@ void Controller::startApplication(const QString &baseDir, const QString &qmlFile
 
     QVariant imports = runtimeParameters.value(qSL("importPaths"));
     const QVariantList ipvl = (imports.type() == QVariant::String) ? QVariantList{imports}
-                                                                  : qdbus_cast<QVariantList>(imports);
+                                                                   : qdbus_cast<QVariantList>(imports);
     for (const QVariant &v : ipvl) {
         const QString path = v.toString();
         const QFileInfo fi(path);
-- 
cgit v1.2.3