diff options
author | Kai Koehne <kai.koehne@qt.io> | 2018-08-30 11:40:35 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@qt.io> | 2018-10-15 06:47:53 +0000 |
commit | 27f54076cd26f57ef815ba1e11fe25f35c5c7b20 (patch) | |
tree | 814bd4058231b295d07ad9712cedccba529d9ada | |
parent | 452246871660e17033ec5f0faab59f53273728e2 (diff) |
Automatically pick up dependencies.json file for qmlplugindump
The dependencies.json file allows to tweak the list of imports the
module is depending on, so that types implicitly imported are not
listed twice.
Task-number: QTBUG-70264
Change-Id: I7a3800e5ea713a8aaae0cddbf4e1607f92c41497
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
-rw-r--r-- | mkspecs/features/qml_plugin.prf | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf index 0786dbfd84..cd6377dcc6 100644 --- a/mkspecs/features/qml_plugin.prf +++ b/mkspecs/features/qml_plugin.prf @@ -110,6 +110,14 @@ load(qt_common) load(resolve_target) TARGETPATHBASE = $$replace(TARGETPATH, \\.\\d+\$, ) + + !qml1_target { + isEmpty(QMAKE_PLUGINDUMP_DEPENDENCIES_FILE):exists($$_PRO_FILE_PWD_/dependencies.json): \ + QMAKE_PLUGINDUMP_DEPENDENCIES_FILE = $$_PRO_FILE_PWD_/dependencies.json + !isEmpty(QMAKE_PLUGINDUMP_DEPENDENCIES_FILE): \ + QMAKE_QMLPLUGINDUMP_FLAGS += -dependencies $$shell_quote($$QMAKE_PLUGINDUMP_DEPENDENCIES_FILE) + } + qmltypes.target = qmltypes qmltypes.commands = $$QMLPLUGINDUMP -nonrelocatable $$QMAKE_QMLPLUGINDUMP_FLAGS $$replace(TARGETPATHBASE, /, .) $$IMPORT_VERSION > $$QMLTYPEFILE qmltypes.depends = $$QMAKE_RESOLVED_TARGET |