diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-08 16:19:17 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-08 17:00:18 +0100 |
| commit | 653c25d48298fb747cf6f3b012816855c51d4260 (patch) | |
| tree | 476d06c3ce41bc8aa42bbe2312d30802a8d8f24e /src/qmltyperegistrar/qmltypes.prf | |
| parent | 7d21113b054a6387687fb486def61dd2f2c4d99f (diff) | |
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 <simon.hausmann@qt.io>
Diffstat (limited to 'src/qmltyperegistrar/qmltypes.prf')
| -rw-r--r-- | src/qmltyperegistrar/qmltypes.prf | 6 |
1 files changed, 4 insertions, 2 deletions
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) { |