AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: Install the qmldir files when configuring for a single abi

Browse Source 
This amends 0ef46b41d8 to ensure the
new configuration is styled correctly for qmake.

Task-number: QTBUG-80938
Change-Id: Iebfff3ff0570d2e92d01d4eb1178c0d6261468f9
Pick-to: 5.15
Reviewed-by: Lars Schmertmann <lars.schmertmann@governikus.de>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Andy Shaw 2020-08-02 20:19:49 +02:00
parent 3f2251994d
commit 7d4baabdae
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/features/android/default_pre.prf
View File

@ -10,7 +10,7 @@ build_pass:armeabi-v7a {
QT_ARCH = x86_64
} else:count(ALL_ANDROID_ABIS, 1) {
QT_ARCH = $$ALL_ANDROID_ABIS
CONFIG += singleAndroidAbi $$QT_ARCH
CONFIG += single_android_abi $$QT_ARCH
} else {
# default architecture
QT_ARCH = arm64-v8a

2
mkspecs/features/android/resolve_config.prf
View File

@ -1,6 +1,6 @@
load(resolve_config)
!equals(TEMPLATE, aux):!host_build:!single_arch:!java:!singleAndroidAbi:android {
!equals(TEMPLATE, aux):!host_build:!single_arch:!java:!single_android_abi:android {
isEmpty(ANDROID_ABIS): ANDROID_ABIS = $$ALL_ANDROID_ABIS
ALL_ABIS = $$join(ANDROID_ABIS, _and_)

2
mkspecs/features/qml_module.prf
View File

@ -61,7 +61,7 @@ qmlfiles.path = $${qmldir.path}
INSTALL_QML_FILES = false
android {
build_pass {
single_android_abi|build_pass {
isEmpty(ANDROID_ABIS): ANDROID_ABIS = $$ALL_ANDROID_ABIS
ABI = $$first(ANDROID_ABIS)
equals(ABI, $$QT_ARCH): INSTALL_QML_FILES = true

2
mkspecs/features/qt_android_deps.prf
View File

@ -15,7 +15,7 @@
ANDROID_DEPENDS_DIR = $$MODULE_BASE_OUTDIR/lib/
DEPENDENCY_FILE = $$ANDROID_DEPENDS_DIR$$TARGET-android-dependencies.xml
build_pass|singleAndroidAbi:!isEmpty(QT_ARCH): {
build_pass|single_android_abi:!isEmpty(QT_ARCH): {
!isEmpty(MODULE_PLUGIN_TYPES) {
for(PLUGIN_TYPE, MODULE_PLUGIN_TYPES) {
ANDROID_BUNDLED_FILES += "plugins/$$PLUGIN_TYPE"

2
mkspecs/features/qt_helper_lib.prf
View File

@ -58,7 +58,7 @@ win32|CONFIG(static, static|shared) {
"QMAKE_DEPENDS_$${ucmodule}_LD =$$join(LD_USES, " ", " ")" \
"QMAKE_INCDIR_$${ucmodule} = $$val_escape(MODULE_INCLUDEPATH)" \
"QMAKE_DEFINES_$${ucmodule} = $$val_escape(MODULE_DEFINES)"
!singleAndroidAbi:android {
!single_android_abi:android {
MODULE_PRI_CONT += "QMAKE_LIBS_$${ucmodule} ="
} else: if(msvc|qtConfig(debug_and_release)): {
win32: \

2
src/network/ssl/ssl.pri
View File

@ -107,7 +107,7 @@ qtConfig(ssl) {
qtConfig(openssl-linked): {
android {
build_pass|singleAndroidAbi: LIBS_PRIVATE += -lssl_$${QT_ARCH} -lcrypto_$${QT_ARCH}
build_pass|single_android_abi: LIBS_PRIVATE += -lssl_$${QT_ARCH} -lcrypto_$${QT_ARCH}
} else: QMAKE_USE_FOR_PRIVATE += openssl
} else: \
QMAKE_USE_FOR_PRIVATE += openssl/nolink