diff --git a/Qt-5.12.3/aarch64/libcrypto.so b/Qt-5.12.3/aarch64/libcrypto.so new file mode 100755 index 0000000..6fa4550 Binary files /dev/null and b/Qt-5.12.3/aarch64/libcrypto.so differ diff --git a/Qt-5.12.3/aarch64/libssl.so b/Qt-5.12.3/aarch64/libssl.so new file mode 100755 index 0000000..6e52077 Binary files /dev/null and b/Qt-5.12.3/aarch64/libssl.so differ diff --git a/Qt-5.12.3/arm/libcrypto.so b/Qt-5.12.3/arm/libcrypto.so new file mode 100755 index 0000000..a202ed1 Binary files /dev/null and b/Qt-5.12.3/arm/libcrypto.so differ diff --git a/Qt-5.12.3/arm/libssl.so b/Qt-5.12.3/arm/libssl.so new file mode 100755 index 0000000..fe8ddb4 Binary files /dev/null and b/Qt-5.12.3/arm/libssl.so differ diff --git a/Qt-5.12.3/x86/libcrypto.so b/Qt-5.12.3/x86/libcrypto.so new file mode 100755 index 0000000..5fa3931 Binary files /dev/null and b/Qt-5.12.3/x86/libcrypto.so differ diff --git a/Qt-5.12.3/x86/libssl.so b/Qt-5.12.3/x86/libssl.so new file mode 100755 index 0000000..cde2d75 Binary files /dev/null and b/Qt-5.12.3/x86/libssl.so differ diff --git a/Qt-5.12.4_5.13.0/arm/libcrypto.so b/Qt-5.12.4_5.13.0/arm/libcrypto.so new file mode 100755 index 0000000..32fbd10 Binary files /dev/null and b/Qt-5.12.4_5.13.0/arm/libcrypto.so differ diff --git a/Qt-5.12.4_5.13.0/arm/libssl.so b/Qt-5.12.4_5.13.0/arm/libssl.so new file mode 100755 index 0000000..805a6c2 Binary files /dev/null and b/Qt-5.12.4_5.13.0/arm/libssl.so differ diff --git a/Qt-5.12.4_5.13.0/arm64/libcrypto.so b/Qt-5.12.4_5.13.0/arm64/libcrypto.so new file mode 100755 index 0000000..c263af2 Binary files /dev/null and b/Qt-5.12.4_5.13.0/arm64/libcrypto.so differ diff --git a/Qt-5.12.4_5.13.0/arm64/libssl.so b/Qt-5.12.4_5.13.0/arm64/libssl.so new file mode 100755 index 0000000..bde4f0b Binary files /dev/null and b/Qt-5.12.4_5.13.0/arm64/libssl.so differ diff --git a/Qt-5.12.4_5.13.0/x86/libcrypto.so b/Qt-5.12.4_5.13.0/x86/libcrypto.so new file mode 100755 index 0000000..ce5ddb6 Binary files /dev/null and b/Qt-5.12.4_5.13.0/x86/libcrypto.so differ diff --git a/Qt-5.12.4_5.13.0/x86/libssl.so b/Qt-5.12.4_5.13.0/x86/libssl.so new file mode 100755 index 0000000..09febf7 Binary files /dev/null and b/Qt-5.12.4_5.13.0/x86/libssl.so differ diff --git a/Qt-5.12.4_5.13.0/x86_64/libcrypto.so b/Qt-5.12.4_5.13.0/x86_64/libcrypto.so new file mode 100755 index 0000000..82c2aac Binary files /dev/null and b/Qt-5.12.4_5.13.0/x86_64/libcrypto.so differ diff --git a/Qt-5.12.4_5.13.0/x86_64/libssl.so b/Qt-5.12.4_5.13.0/x86_64/libssl.so new file mode 100755 index 0000000..0b8a4af Binary files /dev/null and b/Qt-5.12.4_5.13.0/x86_64/libssl.so differ diff --git a/arm/libcrypto_1_1.so b/latest/arm/libcrypto_1_1.so similarity index 100% rename from arm/libcrypto_1_1.so rename to latest/arm/libcrypto_1_1.so diff --git a/arm/libssl_1_1.so b/latest/arm/libssl_1_1.so similarity index 100% rename from arm/libssl_1_1.so rename to latest/arm/libssl_1_1.so diff --git a/arm64/libcrypto_1_1.so b/latest/arm64/libcrypto_1_1.so similarity index 100% rename from arm64/libcrypto_1_1.so rename to latest/arm64/libcrypto_1_1.so diff --git a/arm64/libssl_1_1.so b/latest/arm64/libssl_1_1.so similarity index 100% rename from arm64/libssl_1_1.so rename to latest/arm64/libssl_1_1.so diff --git a/x86/libcrypto_1_1.so b/latest/x86/libcrypto_1_1.so similarity index 100% rename from x86/libcrypto_1_1.so rename to latest/x86/libcrypto_1_1.so diff --git a/x86/libssl_1_1.so b/latest/x86/libssl_1_1.so similarity index 100% rename from x86/libssl_1_1.so rename to latest/x86/libssl_1_1.so diff --git a/x86_64/libcrypto_1_1.so b/latest/x86_64/libcrypto_1_1.so similarity index 100% rename from x86_64/libcrypto_1_1.so rename to latest/x86_64/libcrypto_1_1.so diff --git a/x86_64/libssl_1_1.so b/latest/x86_64/libssl_1_1.so similarity index 100% rename from x86_64/libssl_1_1.so rename to latest/x86_64/libssl_1_1.so diff --git a/openssl.pri b/openssl.pri index b022b2b..6298d5c 100644 --- a/openssl.pri +++ b/openssl.pri @@ -1,35 +1,81 @@ -versionAtLeast(QT_VERSION, "5.14.0") { - ANDROID_EXTRA_LIBS += \ - $$PWD/arm/libcrypto_1_1.so \ - $$PWD/arm/libssl_1_1.so \ - $$PWD/arm64/libcrypto_1_1.so \ - $$PWD/arm64/libssl_1_1.so \ - $$PWD/x86/libcrypto_1_1.so \ - $$PWD/x86/libssl_1_1.so \ - $$PWD/x86_64/libcrypto_1_1.so \ - $$PWD/x86_64/libssl_1_1.so +if (lessThan(QT_VERSION, 5.12.3)) { + contains(ANDROID_TARGET_ARCH, armeabi-v7a) { + ANDROID_EXTRA_LIBS += \ + $$PWD/Qt-5.12.3/arm/libcrypto.so \ + $$PWD/Qt-5.12.3/arm/libssl.so + } + + contains(ANDROID_TARGET_ARCH, arm64-v8a) { + ANDROID_EXTRA_LIBS += \ + $$PWD/Qt-5.12.3/aarch64/libcrypto.so \ + $$PWD/Qt-5.12.3/aarch64/libssl.so + } + + contains(ANDROID_TARGET_ARCH, x86) { + ANDROID_EXTRA_LIBS += \ + $$PWD/Qt-5.12.3/x86/libcrypto.so \ + $$PWD/Qt-5.12.3/x86/libssl.so + } } else { - equals(ANDROID_TARGET_ARCH,armeabi-v7a) { - ANDROID_EXTRA_LIBS += \ - $$PWD/arm/libcrypto_1_1.so \ - $$PWD/arm/libssl_1_1.so - } + if (equals(QT_VERSION, 5.12.4) || equals(QT_VERSION, 5.13.0)) { + contains(ANDROID_TARGET_ARCH, armeabi-v7a) { + ANDROID_EXTRA_LIBS += \ + $$PWD/Qt-5.12.4_5.13.0/arm/libcrypto.so \ + $$PWD/Qt-5.12.4_5.13.0/arm/libssl.so + } - equals(ANDROID_TARGET_ARCH,arm64-v8a) { - ANDROID_EXTRA_LIBS += \ - $$PWD/arm64/libcrypto_1_1.so \ - $$PWD/arm64/libssl_1_1.so - } + contains(ANDROID_TARGET_ARCH, arm64-v8a) { + ANDROID_EXTRA_LIBS += \ + $$PWD/Qt-5.12.4_5.13.0/arm64/libcrypto.so \ + $$PWD/Qt-5.12.4_5.13.0/arm64/libssl.so + } - equals(ANDROID_TARGET_ARCH,x86) { - ANDROID_EXTRA_LIBS += \ - $$PWD/x86/libcrypto_1_1.so \ - $$PWD/x86/libssl_1_1.so - } + contains(ANDROID_TARGET_ARCH, x86) { + ANDROID_EXTRA_LIBS += \ + $$PWD/Qt-5.12.4_5.13.0/x86/libcrypto.so \ + $$PWD/Qt-5.12.4_5.13.0/x86/libssl.so + } - equals(ANDROID_TARGET_ARCH,x86_64) { - ANDROID_EXTRA_LIBS += \ - $$PWD/x86_64/libcrypto_1_1.so \ - $$PWD/x86_64/libssl_1_1.so + contains(ANDROID_TARGET_ARCH, x86_64) { + ANDROID_EXTRA_LIBS += \ + $$PWD/Qt-5.12.4_5.13.0/x86_64/libcrypto.so \ + $$PWD/Qt-5.12.4_5.13.0/x86_64/libssl.so + } + } else { + versionAtLeast(QT_VERSION, "5.14.0") { + ANDROID_EXTRA_LIBS += \ + $$PWD/latest/arm/libcrypto_1_1.so \ + $$PWD/latest/arm/libssl_1_1.so \ + $$PWD/latest/arm64/libcrypto_1_1.so \ + $$PWD/latest/arm64/libssl_1_1.so \ + $$PWD/latest/x86/libcrypto_1_1.so \ + $$PWD/latest/x86/libssl_1_1.so \ + $$PWD/latest/x86_64/libcrypto_1_1.so \ + $$PWD/latest/x86_64/libssl_1_1.so + } else { + equals(ANDROID_TARGET_ARCH, armeabi-v7a) { + ANDROID_EXTRA_LIBS += \ + $$PWD/latest/arm/libcrypto_1_1.so \ + $$PWD/latest/arm/libssl_1_1.so + } + + equals(ANDROID_TARGET_ARCH, arm64-v8a) { + ANDROID_EXTRA_LIBS += \ + $$PWD/latest/arm64/libcrypto_1_1.so \ + $$PWD/latest/arm64/libssl_1_1.so + } + + equals(ANDROID_TARGET_ARCH, x86) { + ANDROID_EXTRA_LIBS += \ + $$PWD/latest/x86/libcrypto_1_1.so \ + $$PWD/latest/x86/libssl_1_1.so + } + + equals(ANDROID_TARGET_ARCH, x86_64) { + ANDROID_EXTRA_LIBS += \ + $$PWD/latest/x86_64/libcrypto_1_1.so \ + $$PWD/latest/x86_64/libssl_1_1.so + } + } } }