summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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+\$, )