37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
|
From 3c075bfd348306cd553caddb9f8bf3f596666636 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alessandro Portale <alessandro.portale@qt.io>
|
||
|
|
Date: Wed, 25 Nov 2020 23:43:03 +0100
|
||
|
|
Subject: [PATCH 15/28] 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)
|
||
|
|
---
|
||
|
|
src/qmltyperegistrar/qmltypes.prf | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/qmltyperegistrar/qmltypes.prf b/src/qmltyperegistrar/qmltypes.prf
|
||
|
|
index 354fa1736f..2cc0027b7e 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
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|