From 315c58509dcd3a2729b4efabef40fd76a6e0c5fa Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 23 Oct 2012 20:10:25 +0200 Subject: fix 'qmltypes' targets should now actually work for all build types Change-Id: I2dc1f8231737c13e95ce8aab1330b4f063951547 Reviewed-by: Joerg Bornemann Reviewed-by: Oswald Buddenhagen --- mkspecs/features/qml_plugin.prf | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'mkspecs/features/qml_plugin.prf') 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 -- cgit v1.2.3