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

Add support for Qt 5.13.

Browse Source 
Update OpenSSL version to 1.1.1d.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-09-20 16:49:16 +03:00
parent 08604f67bb
commit 3b728f10da
7 changed files with 63 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
appveyor.yml
View File

@ -38,8 +38,8 @@ shallow_clone: false # default is "false"
environment: environment:
matrix: matrix:
- QT5: Qt\5.12\mingw73_32 - QT5: Qt\5.13\mingw73_32
QT_VERSION: Qt5.12 QT_VERSION: Qt5.13
QMAKE_GENERATOR: "MinGW Makefiles" QMAKE_GENERATOR: "MinGW Makefiles"
MINGW_PATH: C:\Qt\Tools\mingw730_32\bin MINGW_PATH: C:\Qt\Tools\mingw730_32\bin
PLATFORM: x86 PLATFORM: x86
@ -50,6 +50,22 @@ environment:
MINGW_PATH: C:\Qt\Tools\mingw492_32\bin MINGW_PATH: C:\Qt\Tools\mingw492_32\bin
PLATFORM: x86 PLATFORM: x86
DEPLOY: true DEPLOY: true
- QT5: Qt\5.13\msvc2015_64
QMAKE_GENERATOR: "NMake Makefiles JOM"
VSVER: 14
PLATFORM: x64
DEPLOY: false
- QT5: Qt\5.12\mingw73_32
QT_VERSION: Qt5.12
QMAKE_GENERATOR: "MinGW Makefiles"
MINGW_PATH: C:\Qt\Tools\mingw730_32\bin
PLATFORM: x86
DEPLOY: false
- QT5: Qt\5.12\msvc2015_64
QMAKE_GENERATOR: "NMake Makefiles JOM"
VSVER: 14
PLATFORM: x64
DEPLOY: false
- QT5: Qt\5.11\mingw53_32 - QT5: Qt\5.11\mingw53_32
QT_VERSION: Qt5.11 QT_VERSION: Qt5.11
QMAKE_GENERATOR: "MinGW Makefiles" QMAKE_GENERATOR: "MinGW Makefiles"

31
common.pri
View File

@ -70,17 +70,30 @@ 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 {
INSTALL_OPENSSL += \ greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 11):greaterThan(QT_PATCH_VERSION, 3) {
../../../dist/win/msvcr120.dll # Minimal supported OpenSSL version since Qt 5.12.3 is 1.1.1.
contains(QMAKE_HOST.arch, x86_64) {
contains(QMAKE_HOST.arch, x86_64) { INSTALL_OPENSSL += \
INSTALL_OPENSSL += \ ../../../dist/win/openssl/win64/libcrypto-1_1-x64.dll \
../../../dist/win/openssl/win64/libeay32.dll \ ../../../dist/win/openssl/win64/libssl-1_1-x64.dll
../../../dist/win/openssl/win64/ssleay32.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/libeay32.dll \ ../../../dist/win/msvcr120.dll
../../../dist/win/openssl/win32/ssleay32.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
}
} }
} }

BIN
dist/win/openssl/win32/libcrypto-1_1.dll vendored Normal file
View File

Binary file not shown.

BIN
dist/win/openssl/win32/libssl-1_1.dll vendored Normal file
View File

Binary file not shown.

BIN
dist/win/openssl/win64/libcrypto-1_1-x64.dll vendored Normal file
View File

Binary file not shown.

BIN
dist/win/openssl/win64/libssl-1_1-x64.dll vendored Normal file
View File

Binary file not shown.

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

@ -336,7 +336,6 @@ win32:*g++* {
$$PWD/../../../dist/win/s-measurements.ico \ $$PWD/../../../dist/win/s-measurements.ico \
$$PWD/../../../dist/win/pattern.ico \ $$PWD/../../../dist/win/pattern.ico \
$$PWD/../../../dist/win/pdftops.exe \ $$PWD/../../../dist/win/pdftops.exe \
$$PWD/../../../dist/win/msvcr120.dll \
$$PWD/../../../AUTHORS.txt \ $$PWD/../../../AUTHORS.txt \
$$PWD/../../../LICENSE_GPL.txt \ $$PWD/../../../LICENSE_GPL.txt \
$$PWD/../../../README.txt \ $$PWD/../../../README.txt \
@ -370,14 +369,30 @@ win32:*g++* {
package.files += $$[QT_INSTALL_BINS]/Qt5WinExtras.dll package.files += $$[QT_INSTALL_BINS]/Qt5WinExtras.dll
} }
contains(QMAKE_HOST.arch, x86_64) { greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 11):greaterThan(QT_PATCH_VERSION, 3) {
package.files += \ # Minimal supported OpenSSL version since Qt 5.12.3 is 1.1.1.
../../../dist/win/openssl/win64/libeay32.dll \ contains(QMAKE_HOST.arch, x86_64) {
../../../dist/win/openssl/win64/ssleay32.dll package.files += \
$$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 += \
../../../dist/win/openssl/win32/libeay32.dll \ $$PWD/../../../dist/win/msvcr120.dll \
../../../dist/win/openssl/win32/ssleay32.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