Skip to content

Commit e67d55f

Browse files
committed
fixes KDAB#59
1 parent 57056d6 commit e67d55f

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

android_openssl.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ function(add_android_openssl_libraries)
55
set(ssl_root_path ${CMAKE_CURRENT_FUNCTION_LIST_DIR})
66
endif()
77

8-
if(Qt6_VERSION VERSION_GREATER_EQUAL 6.5.0)
8+
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))
99
if(NOT OPENSSL_ROOT_DIR)
1010
set(OPENSSL_ROOT_DIR ${SSL_ROOT_PATH}/ssl_3/${CMAKE_ANDROID_ARCH_ABI})
1111
endif()

openssl.pri

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
CONFIG(release, debug|release): SSL_PATH = $$PWD
33
else: SSL_PATH = $$PWD/no-asm
44

5-
if (versionAtLeast(QT_VERSION, 6.5.0)) {
5+
if (versionAtLeast(QT_VERSION, 6.5.0) | if(versionAtLeast(QT_VERSION, 5.15.8) : versionAtMost(QT_VERSION, 6.0.0))) {
6+
message(Using OpenSSL v3)
67
ANDROID_EXTRA_LIBS += \
78
$$SSL_PATH/ssl_3/arm64-v8a/libcrypto_3.so \
89
$$SSL_PATH/ssl_3/arm64-v8a/libssl_3.so \
@@ -13,6 +14,7 @@
1314
$$SSL_PATH/ssl_3/x86_64/libcrypto_3.so \
1415
$$SSL_PATH/ssl_3/x86_64/libssl_3.so
1516
} else {
17+
warning("Using OpenSSL v1.1, it was deprecated")
1618
ANDROID_EXTRA_LIBS += \
1719
$$SSL_PATH/ssl_1.1/arm64-v8a/libcrypto_1_1.so \
1820
$$SSL_PATH/ssl_1.1/arm64-v8a/libssl_1_1.so \

0 commit comments

Comments
 (0)