summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-10-23 20:10:25 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-26 12:20:43 +0200
commit315c58509dcd3a2729b4efabef40fd76a6e0c5fa (patch)
treed7c5d9f5b085788b410351085a8499c9c0aa4708
parentb229eff08c816ebe8100dca00ab80ccd88541a5e (diff)
fix 'qmltypes' targets
should now actually work for all build types Change-Id: I2dc1f8231737c13e95ce8aab1330b4f063951547 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rw-r--r--mkspecs/features/qml_plugin.prf11
1 files changed, 10 insertions, 1 deletions
diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf
index 8efc8c9959..8a24e9b36c 100644
--- a/mkspecs/features/qml_plugin.prf
+++ b/mkspecs/features/qml_plugin.prf
@@ -47,8 +47,17 @@ load(qt_targets)
load(resolve_target)
qtPrepareTool(QMLPLUGINDUMP, qmlplugindump)
+ importpath.value =
+ for(qmod, QMAKEMODULES) {
+ qmod = $$section(qmod, /, 0, -3)/imports
+ exists($$qmod): importpath.value += $$shell_path($$qmod)
+ }
+ importpath.name = QML_IMPORT_PATH
+ importpath.value = $$unique(importpath.value)
+ qtAddToolEnv(QMLPLUGINDUMP, importpath)
+ TARGETPATHBASE = $$replace(TARGETPATH, \\.\\d+\$, )
qmltypes.target = qmltypes
- qmltypes.commands = $$QMLPLUGINDUMP $$replace(TARGETPATH, /, .) $$IMPORT_VERSION $$QMAKE_RESOLVED_TARGET > $$QMLTYPEFILE
+ qmltypes.commands = $$QMLPLUGINDUMP $$replace(TARGETPATHBASE, /, .) $$IMPORT_VERSION > $$QMLTYPEFILE
qmltypes.depends = $$QMAKE_RESOLVED_TARGET
} else {
qmltypes.CONFIG += recursive