From 653c25d48298fb747cf6f3b012816855c51d4260 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 8 Jan 2020 16:19:17 +0100 Subject: qmltyperegistrar: Improve resolution of module dependencies Previously transitive private dependencies would not be resolved as resolve_depends would return a foo_private, for which we wouldn't find a Qt.$${dep}.module. Change-Id: Ie8d91d6c82c0d2f2e441a9eb662a14ef9bd82051 Reviewed-by: Simon Hausmann --- src/qmltyperegistrar/qmltypes.prf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/qmltyperegistrar/qmltypes.prf') diff --git a/src/qmltyperegistrar/qmltypes.prf b/src/qmltyperegistrar/qmltypes.prf index ed507f1834..fbb00dbe2d 100644 --- a/src/qmltyperegistrar/qmltypes.prf +++ b/src/qmltyperegistrar/qmltypes.prf @@ -36,10 +36,12 @@ isEmpty(QMLTYPES_FILENAME) { qt_module_deps = $$replace(QT, -private$, '') qt_module_deps += $$replace(QT_PRIVATE, -private$, '') +qt_module_deps = $$resolve_depends(qt_module_deps, "QT.", ".depends" ".run_depends") qt_module_deps = $$replace(qt_module_deps, _private$, '') -all_qt_module_deps = $$resolve_depends(qt_module_deps, "QT.", ".depends" ".run_depends") +qt_module_deps = $$unique(qt_module_deps) + foreign_types = -for(dep, all_qt_module_deps) { +for(dep, qt_module_deps) { METATYPES_FILENAME = $$lower($$eval(QT.$${dep}.module))_metatypes.json INSTALLED_METATYPES = $$[QT_INSTALL_LIBS]/metatypes/$$METATYPES_FILENAME isEmpty(MODULE_BASE_OUTDIR) { -- cgit v1.2.3