diff --git a/appveyor.yml b/appveyor.yml index ad81ad03d..4fd8edd1d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -38,18 +38,34 @@ shallow_clone: false # default is "false" environment: matrix: - - QT5: Qt\5.12\mingw73_32 - QT_VERSION: Qt5.12 + - QT5: Qt\5.13\mingw73_32 + QT_VERSION: Qt5.13 QMAKE_GENERATOR: "MinGW Makefiles" MINGW_PATH: C:\Qt\Tools\mingw730_32\bin PLATFORM: x86 - DEPLOY: true + DEPLOY: true - QT5: Qt\5.6\mingw49_32 QT_VERSION: Qt5.6 QMAKE_GENERATOR: "MinGW Makefiles" MINGW_PATH: C:\Qt\Tools\mingw492_32\bin PLATFORM: x86 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 QT_VERSION: Qt5.11 QMAKE_GENERATOR: "MinGW Makefiles" diff --git a/common.pri b/common.pri index 1634a39ff..cb5f1c304 100644 --- a/common.pri +++ b/common.pri @@ -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 # Qt from scratch without OpenSSL support. win32 { - INSTALL_OPENSSL += \ - ../../../dist/win/msvcr120.dll - - contains(QMAKE_HOST.arch, x86_64) { - INSTALL_OPENSSL += \ - ../../../dist/win/openssl/win64/libeay32.dll \ - ../../../dist/win/openssl/win64/ssleay32.dll + greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 11):greaterThan(QT_PATCH_VERSION, 3) { + # Minimal supported OpenSSL version since Qt 5.12.3 is 1.1.1. + contains(QMAKE_HOST.arch, x86_64) { + INSTALL_OPENSSL += \ + ../../../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 { INSTALL_OPENSSL += \ - ../../../dist/win/openssl/win32/libeay32.dll \ - ../../../dist/win/openssl/win32/ssleay32.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 + } } } diff --git a/dist/win/openssl/win32/libcrypto-1_1.dll b/dist/win/openssl/win32/libcrypto-1_1.dll new file mode 100644 index 000000000..d88ec94ca Binary files /dev/null and b/dist/win/openssl/win32/libcrypto-1_1.dll differ diff --git a/dist/win/openssl/win32/libssl-1_1.dll b/dist/win/openssl/win32/libssl-1_1.dll new file mode 100644 index 000000000..4aa4c098a Binary files /dev/null and b/dist/win/openssl/win32/libssl-1_1.dll differ diff --git a/dist/win/openssl/win64/libcrypto-1_1-x64.dll b/dist/win/openssl/win64/libcrypto-1_1-x64.dll new file mode 100644 index 000000000..2e0f7ff54 Binary files /dev/null and b/dist/win/openssl/win64/libcrypto-1_1-x64.dll differ diff --git a/dist/win/openssl/win64/libssl-1_1-x64.dll b/dist/win/openssl/win64/libssl-1_1-x64.dll new file mode 100644 index 000000000..be0e20698 Binary files /dev/null and b/dist/win/openssl/win64/libssl-1_1-x64.dll differ diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index 6b9f94cfa..2a12d5568 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -336,7 +336,6 @@ win32:*g++* { $$PWD/../../../dist/win/s-measurements.ico \ $$PWD/../../../dist/win/pattern.ico \ $$PWD/../../../dist/win/pdftops.exe \ - $$PWD/../../../dist/win/msvcr120.dll \ $$PWD/../../../AUTHORS.txt \ $$PWD/../../../LICENSE_GPL.txt \ $$PWD/../../../README.txt \ @@ -370,14 +369,30 @@ win32:*g++* { package.files += $$[QT_INSTALL_BINS]/Qt5WinExtras.dll } - contains(QMAKE_HOST.arch, x86_64) { - package.files += \ - ../../../dist/win/openssl/win64/libeay32.dll \ - ../../../dist/win/openssl/win64/ssleay32.dll + greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 11):greaterThan(QT_PATCH_VERSION, 3) { + # Minimal supported OpenSSL version since Qt 5.12.3 is 1.1.1. + contains(QMAKE_HOST.arch, x86_64) { + 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 { package.files += \ - ../../../dist/win/openssl/win32/libeay32.dll \ - ../../../dist/win/openssl/win32/ssleay32.dll + $$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