aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix testing Qt version for OpenSSL.

Browse Source 
--HG--
branch : develop
This commit is contained in:
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

17
common.pri
View File

@ -70,7 +70,8 @@ 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) {
versionAtLeast(QT_VERSION, 5.12.4){
# Minimal supported OpenSSL version since Qt 5.12.4 is 1.1.1. # Minimal supported OpenSSL version since Qt 5.12.4 is 1.1.1.
contains(QMAKE_HOST.arch, x86_64) { contains(QMAKE_HOST.arch, x86_64) {
INSTALL_OPENSSL += \ INSTALL_OPENSSL += \
@ -85,6 +86,20 @@ win32 {
INSTALL_OPENSSL += \ INSTALL_OPENSSL += \
../../../dist/win/msvcr120.dll ../../../dist/win/msvcr120.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 {
INSTALL_OPENSSL += \
../../../dist/win/msvcr120.dll
contains(QMAKE_HOST.arch, x86_64) { contains(QMAKE_HOST.arch, x86_64) {
INSTALL_OPENSSL += \ INSTALL_OPENSSL += \
../../../dist/win/openssl/win64/libeay32.dll \ ../../../dist/win/openssl/win64/libeay32.dll \

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

@ -369,7 +369,8 @@ 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) {
versionAtLeast(QT_VERSION, 5.12.4){
# Minimal supported OpenSSL version since Qt 5.12.4 is 1.1.1. # Minimal supported OpenSSL version since Qt 5.12.4 is 1.1.1.
contains(QMAKE_HOST.arch, x86_64) { contains(QMAKE_HOST.arch, x86_64) {
package.files += \ package.files += \
@ -394,6 +395,20 @@ win32:*g++* {
$$PWD/../../../dist/win/openssl/win32/ssleay32.dll $$PWD/../../../dist/win/openssl/win32/ssleay32.dll
} }
} }
} else {
package.files += \
$$PWD/../../../dist/win/msvcr120.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
}
}
package.CONFIG = no_check_exist package.CONFIG = no_check_exist
INSTALLS += package INSTALLS += package