From 7d4baabdaefdc20cc7df6314230916477c76e7ff Mon Sep 17 00:00:00 2001
From: Andy Shaw <andy.shaw@qt.io>
Date: Sun, 2 Aug 2020 20:19:49 +0200
Subject: [PATCH] Android: Install the qmldir files when configuring for a
 single abi

This amends 0ef46b41d86b9fad4fc4a18bd577d208afa1fce8 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>
---
 mkspecs/features/android/default_pre.prf    | 2 +-
 mkspecs/features/android/resolve_config.prf | 2 +-
 mkspecs/features/qml_module.prf             | 2 +-
 mkspecs/features/qt_android_deps.prf        | 2 +-
 mkspecs/features/qt_helper_lib.prf          | 2 +-
 src/network/ssl/ssl.pri                     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mkspecs/features/android/default_pre.prf b/mkspecs/features/android/default_pre.prf
index f7383c386c..eaa2b0c666 100644
--- a/mkspecs/features/android/default_pre.prf
+++ b/mkspecs/features/android/default_pre.prf
@@ -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
diff --git a/mkspecs/features/android/resolve_config.prf b/mkspecs/features/android/resolve_config.prf
index 14749abcc0..f4ccd88e31 100644
--- a/mkspecs/features/android/resolve_config.prf
+++ b/mkspecs/features/android/resolve_config.prf
@@ -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_)
diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf
index c0b50416c9..3d6cd9b3db 100644
--- a/mkspecs/features/qml_module.prf
+++ b/mkspecs/features/qml_module.prf
@@ -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
diff --git a/mkspecs/features/qt_android_deps.prf b/mkspecs/features/qt_android_deps.prf
index a316c59069..0fff45f458 100644
--- a/mkspecs/features/qt_android_deps.prf
+++ b/mkspecs/features/qt_android_deps.prf
@@ -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"
diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf
index 56fc12015b..bc20251bd9 100644
--- a/mkspecs/features/qt_helper_lib.prf
+++ b/mkspecs/features/qt_helper_lib.prf
@@ -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: \
diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
index 590bb7f0b4..d1b5bafc45 100644
--- a/src/network/ssl/ssl.pri
+++ b/src/network/ssl/ssl.pri
@@ -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