summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-06-02 13:40:53 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-06-05 17:11:55 +0200
commitf9b61eca4e48f59a2d4c3b9f131b88d4e7c3b6a9 (patch)
treebb7d641abd9fc424992660d589a8ec601a4d6c86
parent7a1e17a3500b182350a638ab08c8c74ee1c205c1 (diff)
use the right env var in qmlplugindump call
qml2 needs QML2_IMPORT_PATH. this didn't affect non-prefix builds (which most developers use), so it wasn't too serious. Change-Id: I435dca151348669b66f091f9a9324cd69394284e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--mkspecs/features/qml_plugin.prf8
1 files changed, 5 insertions, 3 deletions
diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf
index ad55b889ac..bfd01c6eda 100644
--- a/mkspecs/features/qml_plugin.prf
+++ b/mkspecs/features/qml_plugin.prf
@@ -75,10 +75,13 @@ load(qt_common)
}
load(resolve_target)
- qml1_target: \
+ qml1_target {
qmlplugindump = qml1plugindump
- else: \
+ importpath.name = QML_IMPORT_PATH
+ } else {
qmlplugindump = qmlplugindump
+ importpath.name = QML2_IMPORT_PATH
+ }
qtPrepareTool(QMLPLUGINDUMP, $$qmlplugindump)
importpath.value =
for(qmod, QTREPOS) {
@@ -88,7 +91,6 @@ load(qt_common)
qmod = $$qmod/qml
exists($$qmod): importpath.value += $$shell_path($$qmod)
}
- importpath.name = QML_IMPORT_PATH
importpath.value = $$unique(importpath.value)
qtAddToolEnv(QMLPLUGINDUMP, importpath)
TARGETPATHBASE = $$replace(TARGETPATH, \\.\\d+\$, )