diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-05-12 15:24:45 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-23 11:39:25 +0200 |
commit | 3b7599800e3c0185f5a5632460eb830103945062 (patch) | |
tree | 7976b7cb224d5f35c4b2e6a7ceb05bb488ae7579 /mkspecs/features/qml_plugin.prf | |
parent | a658fa40d3c4d61ac3c655df9f57630a26192d74 (diff) |
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 <joerg.bornemann@digia.com>
Diffstat (limited to 'mkspecs/features/qml_plugin.prf')
-rw-r--r-- | mkspecs/features/qml_plugin.prf | 8 |
1 files 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 |