From ac9e9db2d0a909246ae2bc787a34916f92e085e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=80lex=20Fiestas?= <afiestas@kde.org>
Date: Thu, 16 Mar 2017 11:56:08 +0100
Subject: [PATCH] Remove or replace all uses of qmlImportsPath by
 qtToBeBundledInfo

It seems that the removal of qmlImportsPath was half-done and there were
still some uses of it around.
---
 shared/shared.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/shared/shared.cpp b/shared/shared.cpp
index 939a90e..b025458 100644
--- a/shared/shared.cpp
+++ b/shared/shared.cpp
@@ -1075,13 +1075,10 @@ bool deployQmlImports(const QString &appDirPath, DeploymentInfo deploymentInfo,
         argumentList.append(qmlDir);
     }
 
-    argumentList.append( "-importPath");
-    argumentList.append(qmlImportsPath);
-
     argumentList.append( "-importPath");
     argumentList.append(qtToBeBundledInfo.value("QT_INSTALL_QML "));
 
-    LogDebug() << "qmlImportsPath:" << qmlImportsPath;
+    LogDebug() << "qmlImportsPath (QT_INSTALL_QML):" << qtToBeBundledInfo.value("QT_INSTALL_QML ");
 	
     // run qmlimportscanner
     QProcess qmlImportScanner;
@@ -1168,7 +1165,7 @@ bool deployQmlImports(const QString &appDirPath, DeploymentInfo deploymentInfo,
     if (deploymentInfo.deployedLibraries.contains("QtWidgets") && qtQuickContolsInUse) {
         LogNormal() << "Deploying QML import QtQuick/PrivateWidgets";
         QString name = "QtQuick/PrivateWidgets";
-        QString path = qmlImportsPath + QLatin1Char('/') + name;
+        QString path = qtToBeBundledInfo.value("QT_INSTALL_QML ") + QLatin1Char('/') + name;
         deployQmlImport(appDirPath, deploymentInfo.rpathsUsed, path, name);
         LogNormal() << "";
     }