fixes KDAB#59

seyedmmousavi · Apr 4, 2024 · e67d55f · e67d55f
1 parent 57056d6
commit e67d55f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/android_openssl.cmake b/android_openssl.cmake
@@ -5,7 +5,7 @@ function(add_android_openssl_libraries)
     set(ssl_root_path ${CMAKE_CURRENT_FUNCTION_LIST_DIR})
   endif()
 
-  if(Qt6_VERSION VERSION_GREATER_EQUAL 6.5.0)
+  if(Qt6_VERSION VERSION_GREATER_EQUAL 6.5.0 OR (QT_VERSION VERSION_GREATER_EQUAL 5.15.8 AND QT_VERSION VERSION_LESS 6.0.0))
     if(NOT OPENSSL_ROOT_DIR)
       set(OPENSSL_ROOT_DIR ${SSL_ROOT_PATH}/ssl_3/${CMAKE_ANDROID_ARCH_ABI})
     endif()

diff --git a/openssl.pri b/openssl.pri
@@ -2,7 +2,8 @@
     CONFIG(release, debug|release): SSL_PATH = $$PWD
                               else: SSL_PATH = $$PWD/no-asm
 
-    if (versionAtLeast(QT_VERSION, 6.5.0)) {
+    if (versionAtLeast(QT_VERSION, 6.5.0) | if(versionAtLeast(QT_VERSION, 5.15.8) : versionAtMost(QT_VERSION, 6.0.0))) {
+        message(Using OpenSSL v3)
         ANDROID_EXTRA_LIBS += \
             $$SSL_PATH/ssl_3/arm64-v8a/libcrypto_3.so \
             $$SSL_PATH/ssl_3/arm64-v8a/libssl_3.so \
@@ -13,6 +14,7 @@
             $$SSL_PATH/ssl_3/x86_64/libcrypto_3.so \
             $$SSL_PATH/ssl_3/x86_64/libssl_3.so
     } else {
+        warning("Using OpenSSL v1.1, it was deprecated")
         ANDROID_EXTRA_LIBS += \
             $$SSL_PATH/ssl_1.1/arm64-v8a/libcrypto_1_1.so \
             $$SSL_PATH/ssl_1.1/arm64-v8a/libssl_1_1.so \