diff --git a/common.pri b/common.pri index 7753a3baf..eb6318df4 100644 --- a/common.pri +++ b/common.pri @@ -25,6 +25,21 @@ win32{ VCOPY = $$QMAKE_COPY /D } +# See question on StackOwerflow "QSslSocket error when SSL is NOT used" (http://stackoverflow.com/a/31277055/3045403) +# Copy of answer: +# We occasionally had customers getting very similar warning messages but the software was also crashing. +# We determined it was because, although we weren't using SSL either, the program found a copy of OpenSSL on the +# customer's computer and tried interfacing with it. The version it found was too old though (from Qt 5.2 onwards v1.0.0 +# or later is required). +# +# 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/libeay32.dll \ + ../../../dist/win/ssleay32.dll +} + macx{ # QTBUG-31034 qmake doesn't allow override QMAKE_CXX CONFIG+=no_ccache diff --git a/dist/win/libeay32.dll b/dist/win/libeay32.dll new file mode 100644 index 000000000..db98e5b82 Binary files /dev/null and b/dist/win/libeay32.dll differ diff --git a/dist/win/ssleay32.dll b/dist/win/ssleay32.dll new file mode 100644 index 000000000..965b6091a Binary files /dev/null and b/dist/win/ssleay32.dll differ diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index 83ca0388d..9cf32625f 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -259,6 +259,15 @@ unix{ } } +#win32 { + for(DIR, INSTALL_OPENSSL) { + #add these absolute paths to a variable which + #ends up as 'mkcommands = path1 path2 path3 ...' + openssl_path += $${PWD}/$$DIR + } + copyToDestdir($$openssl_path, $$shell_path($${OUT_PWD}/$$DESTDIR)) +#} + # Compilation will fail without this files after we added them to this section. OTHER_FILES += \ share/resources/tapeicon/64x64/logo.ico \ # Tape's logo. diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index af55048c5..0dc74aaf5 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -285,6 +285,8 @@ win32:*-g++ { $$PWD/../../../dist/win/s-measurements.ico \ $$PWD/../../../dist/win/pattern.ico \ $$PWD/../../../dist/win/pdftops.exe \ + $$PWD/../../../dist/win/libeay32.dll \ + $$PWD/../../../dist/win/ssleay32.dll \ $$PWD/../../../AUTHORS.txt \ $$PWD/../../../LICENSE_GPL.txt \ $$PWD/../../../README.txt \ @@ -437,6 +439,13 @@ win32 { pdftops_path += $${PWD}/$$DIR } copyToDestdir($$pdftops_path, $$shell_path($${OUT_PWD}/$$DESTDIR)) + + for(DIR, INSTALL_OPENSSL) { + #add these absolute paths to a variable which + #ends up as 'mkcommands = path1 path2 path3 ...' + openssl_path += $${PWD}/$$DIR + } + copyToDestdir($$openssl_path, $$shell_path($${OUT_PWD}/$$DESTDIR)) } noRunPath{ # For enable run qmake with CONFIG+=noRunPath