From ae32509461b52d333cb49913b4c67e1518101e0e Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kde.org>
Date: Thu, 24 Oct 2019 13:21:07 +0300
Subject: [PATCH] Add Qt 5.14.0+ support

---
 openssl.pri | 44 ++++++++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/openssl.pri b/openssl.pri
index b55a6e7..b022b2b 100644
--- a/openssl.pri
+++ b/openssl.pri
@@ -1,23 +1,35 @@
-equals(ANDROID_TARGET_ARCH,armeabi-v7a) {
+versionAtLeast(QT_VERSION, "5.14.0") {
     ANDROID_EXTRA_LIBS += \
         $$PWD/arm/libcrypto_1_1.so \
-        $$PWD/arm/libssl_1_1.so
-}
-
-equals(ANDROID_TARGET_ARCH,arm64-v8a) {
-    ANDROID_EXTRA_LIBS += \
+        $$PWD/arm/libssl_1_1.so \
         $$PWD/arm64/libcrypto_1_1.so \
-        $$PWD/arm64/libssl_1_1.so
-}
-
-equals(ANDROID_TARGET_ARCH,x86) {
-    ANDROID_EXTRA_LIBS += \
+        $$PWD/arm64/libssl_1_1.so \
         $$PWD/x86/libcrypto_1_1.so \
-        $$PWD/x86/libssl_1_1.so
-}
-
-equals(ANDROID_TARGET_ARCH,x86_64) {
-    ANDROID_EXTRA_LIBS += \
+        $$PWD/x86/libssl_1_1.so \
         $$PWD/x86_64/libcrypto_1_1.so \
         $$PWD/x86_64/libssl_1_1.so
+} else {
+    equals(ANDROID_TARGET_ARCH,armeabi-v7a) {
+        ANDROID_EXTRA_LIBS += \
+            $$PWD/arm/libcrypto_1_1.so \
+            $$PWD/arm/libssl_1_1.so
+    }
+
+    equals(ANDROID_TARGET_ARCH,arm64-v8a) {
+        ANDROID_EXTRA_LIBS += \
+            $$PWD/arm64/libcrypto_1_1.so \
+            $$PWD/arm64/libssl_1_1.so
+    }
+
+    equals(ANDROID_TARGET_ARCH,x86) {
+        ANDROID_EXTRA_LIBS += \
+            $$PWD/x86/libcrypto_1_1.so \
+            $$PWD/x86/libssl_1_1.so
+    }
+
+    equals(ANDROID_TARGET_ARCH,x86_64) {
+        ANDROID_EXTRA_LIBS += \
+            $$PWD/x86_64/libcrypto_1_1.so \
+            $$PWD/x86_64/libssl_1_1.so
+    }
 }