diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2020-11-25 23:43:03 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-26 20:15:13 +0000 |
| commit | f9af3434498b65ecb89bf7054c71773d066fef0b (patch) | |
| tree | cfd2e4c118684af0db5412202e5d3864b76ab87d /src/qmltyperegistrar | |
| parent | a74aee385f90775236f3d73ca62acc752a4a9770 (diff) | |
qmltypes.prf: Take abi into account for *_metatypes.json file names
The lib/metatypes/*_metatypes.json file names contain the ABI. When
constructing the qmltyperegistrar command, the right file names
with that ABI part need to be passed as "foreign-types".
Fixes: QTBUG-85888
Fixes: QTBUG-87117
Change-Id: I20daac1b6b9a27c5ac48b3c2c685e2fed301e213
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit acc5e48a90d0daeccb28175b80ab6b52cac5d84a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/qmltyperegistrar')
| -rw-r--r-- | src/qmltyperegistrar/qmltypes.prf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qmltyperegistrar/qmltypes.prf b/src/qmltyperegistrar/qmltypes.prf index 0b857ad099..74e841e29c 100644 --- a/src/qmltyperegistrar/qmltypes.prf +++ b/src/qmltyperegistrar/qmltypes.prf @@ -44,7 +44,8 @@ qt_module_deps = $$replace(qt_module_deps, _private$, '') qt_module_deps = $$unique(qt_module_deps) for(dep, qt_module_deps) { - METATYPES_FILENAME = $$lower($$eval(QT.$${dep}.module))_metatypes.json + android:ABI = _$${ANDROID_TARGET_ARCH} + METATYPES_FILENAME = $$lower($$eval(QT.$${dep}.module))$${ABI}_metatypes.json INSTALLED_METATYPES = $$[QT_INSTALL_LIBS]/metatypes/$$METATYPES_FILENAME isEmpty(MODULE_BASE_OUTDIR) { QML_FOREIGN_METATYPES += $$INSTALLED_METATYPES |