Let pri file handle dependency resolution according to the Qt version

Re-organize the libs structure such that, the right libs will be included
depending on the Qt version being used, to make users life easier.
This practically combines previous tags/branches into master.
This commit is contained in:
Assam Boudjelthia
2020-03-05 11:32:21 +02:00
committed by BogDan Vatra
parent ebb0b68be4
commit 0fff8f8039
23 changed files with 75 additions and 29 deletions
+75 -29
View File
@@ -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
}
}
}
}