From 3b7599800e3c0185f5a5632460eb830103945062 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 12 May 2014 15:24:45 +0200 Subject: [PATCH] fix qmlplugindump's import path construction the location of the import paths have changed a long time ago. also, we can make use of QTREPOS now. Change-Id: Iee50854b7441968c3c60538e54d9312e53d39cb6 Reviewed-by: Joerg Bornemann --- mkspecs/features/qml_plugin.prf | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf index f161a71ef9..ad55b889ac 100644 --- a/mkspecs/features/qml_plugin.prf +++ b/mkspecs/features/qml_plugin.prf @@ -81,9 +81,11 @@ load(qt_common) qmlplugindump = qmlplugindump qtPrepareTool(QMLPLUGINDUMP, $$qmlplugindump) importpath.value = - for(qmod, QMAKEMODULES) { - qmod = $$section(qmod, /, 0, -3)/imports - qml1_target: qmod = $$qmod/QtDeclarative + for(qmod, QTREPOS) { + qml1_target: \ + qmod = $$qmod/imports + else: \ + qmod = $$qmod/qml exists($$qmod): importpath.value += $$shell_path($$qmod) } importpath.name = QML_IMPORT_PATH