diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-03-25 13:24:44 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-03-26 10:42:41 +0100 |
| commit | 089b3ed0e440b454038a9d3cd6311f9dc189b699 (patch) | |
| tree | 14c2161571b577040b4cd10c17d1ed713dd05142 /src/qmltyperegistrar | |
| parent | 8ab467835cdf590bcbc3a4d520f0e44dc8b457d9 (diff) | |
qmltyperegistrar: Accept extra foreign types files
If you add your own libraries with metatypes, qmake cannot determine
where to look for their metatypes.json files. Add a qmake variable that
allows the user to specify them.
Fixes: QTBUG-82709
Change-Id: I3f5685146c134c89e541e4097ff3928de9af2aee
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qmltyperegistrar')
| -rw-r--r-- | src/qmltyperegistrar/qmltypes.prf | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qmltyperegistrar/qmltypes.prf b/src/qmltyperegistrar/qmltypes.prf index fbb00dbe2d..16f0caec66 100644 --- a/src/qmltyperegistrar/qmltypes.prf +++ b/src/qmltyperegistrar/qmltypes.prf @@ -40,25 +40,25 @@ qt_module_deps = $$resolve_depends(qt_module_deps, "QT.", ".depends" ".run_depen qt_module_deps = $$replace(qt_module_deps, _private$, '') qt_module_deps = $$unique(qt_module_deps) -foreign_types = 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) { - foreign_types += $$INSTALLED_METATYPES + QML_FOREIGN_METATYPES += $$INSTALLED_METATYPES } else { MODULE_BASE_METATYPES = $$MODULE_BASE_OUTDIR/lib/metatypes/$$METATYPES_FILENAME - exists($$MODULE_BASE_METATYPES): foreign_types += $$MODULE_BASE_METATYPES - else: foreign_types += $$INSTALLED_METATYPES + exists($$MODULE_BASE_METATYPES): QML_FOREIGN_METATYPES += $$MODULE_BASE_METATYPES + else: QML_FOREIGN_METATYPES += $$INSTALLED_METATYPES } } + QML_TYPEREGISTRAR_FLAGS = \ --generate-qmltypes=$$QMLTYPES_FILENAME \ --import-name=$$QML_IMPORT_NAME \ --major-version=$$QML_IMPORT_MAJOR_VERSION \ --minor-version=$$QML_IMPORT_MINOR_VERSION \ - --foreign-types=$$join(foreign_types, ',') + --foreign-types=$$join(QML_FOREIGN_METATYPES, ',') DEPENDENCIESFILE = $$_PRO_FILE_PWD_/dependencies.json exists($$DEPENDENCIESFILE): QML_TYPEREGISTRAR_FLAGS += --dependencies=$$DEPENDENCIESFILE |