From a658fa40d3c4d61ac3c655df9f57630a26192d74 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Mon, 12 May 2014 15:23:27 +0200
Subject: fix/simplify the qmlimportscanner's import path construction

now that we have QTREPOS, we can use that directly instead of collecting
the QT.<foo>.qml dirs. as a "side effect", this makes qml modules without
a corresponding c++ module available to the scan.

Change-Id: I6f172121588ec01c9fa47a99d9990bf9fcfbc69f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 mkspecs/features/qt.prf | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 54423017ee..c3395d09ac 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -82,13 +82,9 @@ contains(qt_module_deps, qml): \
         contains(QT_CONFIG, static):contains(TEMPLATE, .*app):!host_build:!no_import_scan {
     # run qmlimportscanner
     qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner)
-    for (MODULE, QT_MODULES) {
-        PATH = $$eval(QT.$${MODULE}.qml)
-        !isEmpty(PATH):exists($$PATH): QMLPATHS += $$PATH
-    }
-    QMLPATHS = $$unique(QMLPATHS)
-    for (QMLPATH, QMLPATHS): \
-        IMPORTPATHS += -importPath $$QMLPATH
+    for (qrep, QTREPOS): \
+        exists($$qrep/qml): \
+            IMPORTPATHS += -importPath $$qrep/qml
 
     #message(run $$QMLIMPORTSCANNER $$_PRO_FILE_PWD_  $$IMPORTPATHS)
     JSON = $$system($$QMLIMPORTSCANNER $$_PRO_FILE_PWD_ $$IMPORTPATHS)
-- 
cgit v1.2.3