From fb472b74cb437fbfd6cbb676a7ba07a27a982688 Mon Sep 17 00:00:00 2001 From: Riccardo Ferrazzo Date: Thu, 14 May 2020 22:17:20 +0200 Subject: [PATCH] Fix the Qt 5.12.3 case --- CMakeLists.txt | 2 +- openssl.pri | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 147f512..3c0bf8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ else() endif() -if (QT_VERSION LESS 5.12.3) +if (QT_VERSION LESS 5.12.4) message(QT_VERSION) if (ANDROID_TARGET_ARCH STREQUAL "armeabi-v7a") set(ANDROID_EXTRA_LIBS diff --git a/openssl.pri b/openssl.pri index 59d1817..c4067d7 100644 --- a/openssl.pri +++ b/openssl.pri @@ -2,7 +2,7 @@ CONFIG(release, debug|release): SSL_PATH = $$PWD else: SSL_PATH = $$PWD/no-asm - if (lessThan(QT_VERSION, 5.12.3)) { + if (lessThan(QT_VERSION, 5.12.4)) { contains(ANDROID_TARGET_ARCH, armeabi-v7a) { ANDROID_EXTRA_LIBS += \ $$SSL_PATH/Qt-5.12.3/arm/libcrypto.so \