summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2019-11-07 16:58:19 +0100
committerUlf Hermann <ulf.hermann@qt.io>2019-11-11 10:20:13 +0100
commit18753e5493153b0e880deff60fc67100abd99986 (patch)
treedd73ffe1c44d2e35ae3aa5a77acf46fd41994dbe /mkspecs
parent004e3e0dc2cab4a4534d2ed3ace41aad6bfbe45d (diff)
Don't create duplicate plugins.qmltypes rules
If the qmltypes are generated by qmltyperegistrar, we should not offer a rule to generate them using qmlplugindump. Otherwise we get warnings from make. Change-Id: Ifb88cbff8e6c577f9889ff3f071bf31f48f634ad Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qml_plugin.prf5
1 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf
index f1c5658b04..1b67435787 100644
--- a/mkspecs/features/qml_plugin.prf
+++ b/mkspecs/features/qml_plugin.prf
@@ -68,7 +68,10 @@ load(qt_common)
# To regenerate run 'make qmltypes' which will update the plugins.qmltypes file in the source
# directory. Then review and commit the changes made to plugins.qmltypes.
#
-!cross_compile {
+# Due to the above mentioned drawbacks, there is a better mechanism available now: qmltyperegistrar
+# can generate the .qmltypes files at compile time. It will do this when CONFIG += qmltypes is set.
+# Therefore, don't try to generate the qmltypes files via qmlplugindump in that case.
+!cross_compile:!qmltypes {
qmlplugindump = qmlplugindump
importpath.name = QML2_IMPORT_PATH
importpath.value =