palo
/
valentina
mirror of https://gitlab.com/smart-pattern/valentina.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix testing Qt version for OpenSSL. 

--HG--
branch : develop
merge-requests/1/merge
Roman Telezhynskyi 2019-09-21 11:19:10 +03:00
parent e72f23d92a
commit 2b7af8e999
2 changed files with 46 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
common.pri
View File

@ -70,16 +70,31 @@ macx{
# Our solution was to distribute the OpenSSL DLLs along with our application (~1.65 MB). The alternative is to compile # Our solution was to distribute the OpenSSL DLLs along with our application (~1.65 MB). The alternative is to compile
# Qt from scratch without OpenSSL support. # Qt from scratch without OpenSSL support.
win32 { win32 {
greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 11):greaterThan(QT_PATCH_VERSION, 3) { greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 10) {
# Minimal supported OpenSSL version since Qt 5.12.4 is 1.1.1. versionAtLeast(QT_VERSION, 5.12.4){
contains(QMAKE_HOST.arch, x86_64) { # Minimal supported OpenSSL version since Qt 5.12.4 is 1.1.1.
INSTALL_OPENSSL += \ contains(QMAKE_HOST.arch, x86_64) {
../../../dist/win/openssl/win64/libcrypto-1_1-x64.dll \ INSTALL_OPENSSL += \
../../../dist/win/openssl/win64/libssl-1_1-x64.dll ../../../dist/win/openssl/win64/libcrypto-1_1-x64.dll \
../../../dist/win/openssl/win64/libssl-1_1-x64.dll
} else {
INSTALL_OPENSSL += \
../../../dist/win/openssl/win32/libcrypto-1_1.dll \
../../../dist/win/openssl/win32/libssl-1_1.dll
}
} else { } else {
INSTALL_OPENSSL += \ INSTALL_OPENSSL += \
../../../dist/win/openssl/win32/libcrypto-1_1.dll \ ../../../dist/win/msvcr120.dll
../../../dist/win/openssl/win32/libssl-1_1.dll
contains(QMAKE_HOST.arch, x86_64) {
INSTALL_OPENSSL += \
../../../dist/win/openssl/win64/libeay32.dll \
../../../dist/win/openssl/win64/ssleay32.dll
} else {
INSTALL_OPENSSL += \
../../../dist/win/openssl/win32/libeay32.dll \
../../../dist/win/openssl/win32/ssleay32.dll
}
} }
} else { } else {
INSTALL_OPENSSL += \ INSTALL_OPENSSL += \

31
src/app/valentina/valentina.pro
View File

@ -369,16 +369,31 @@ win32:*g++* {
package.files += $$[QT_INSTALL_BINS]/Qt5WinExtras.dll package.files += $$[QT_INSTALL_BINS]/Qt5WinExtras.dll
} }
greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 11):greaterThan(QT_PATCH_VERSION, 3) { greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 10) {
# Minimal supported OpenSSL version since Qt 5.12.4 is 1.1.1. versionAtLeast(QT_VERSION, 5.12.4){
contains(QMAKE_HOST.arch, x86_64) { # Minimal supported OpenSSL version since Qt 5.12.4 is 1.1.1.
package.files += \ contains(QMAKE_HOST.arch, x86_64) {
$$PWD/../../../dist/win/openssl/win64/libcrypto-1_1-x64.dll \ package.files += \
$$PWD/../../../dist/win/openssl/win64/libssl-1_1-x64.dll $$PWD/../../../dist/win/openssl/win64/libcrypto-1_1-x64.dll \
$$PWD/../../../dist/win/openssl/win64/libssl-1_1-x64.dll
} else {
package.files += \
$$PWD/../../../dist/win/openssl/win32/libcrypto-1_1.dll \
$$PWD/../../../dist/win/openssl/win32/libssl-1_1.dll
}
} else { } else {
package.files += \ package.files += \
$$PWD/../../../dist/win/openssl/win32/libcrypto-1_1.dll \ $$PWD/../../../dist/win/msvcr120.dll \
$$PWD/../../../dist/win/openssl/win32/libssl-1_1.dll
contains(QMAKE_HOST.arch, x86_64) {
package.files += \
$$PWD/../../../dist/win/openssl/win64/libeay32.dll \
$$PWD/../../../dist/win/openssl/win64/ssleay32.dll
} else {
package.files += \
$$PWD/../../../dist/win/openssl/win32/libeay32.dll \
$$PWD/../../../dist/win/openssl/win32/ssleay32.dll
}
} }
} else { } else {
package.files += \ package.files += \