diff options
| author |   Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-26 10:55:35 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-03 13:01:36 +0000 |
| commit | b3c3520e1ca7e9c26767ccd7b6f79b543b440cf6 (patch) | |
| tree | 5a3ea094fbe96feaa8eb65a6b4eaa379d6250b16 | |
| parent | Windows QPA: Don't test for Desktop GL if Qt::AA_UseDesktopOpenGL is set (diff) | |
| download | qtbase-b3c3520e1ca7e9c26767ccd7b6f79b543b440cf6.tar.xz qtbase-b3c3520e1ca7e9c26767ccd7b6f79b543b440cf6.zip | |
Fail faster on OpenSSL 1.1
We don't support OpenSSL 1.1 in 5.9.x, so fail at configure time instead
of with weird compile-time errors.
Change-Id: I1c1029c5b369bdc1134f6c549bab5692c79a3bc0
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| -rw-r--r-- | config.tests/openssl/openssl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config.tests/openssl/openssl.cpp b/config.tests/openssl/openssl.cpp index d33b62389c..6c8a9e8f19 100644 --- a/config.tests/openssl/openssl.cpp +++ b/config.tests/openssl/openssl.cpp @@ -39,8 +39,8 @@ #include <openssl/opensslv.h> -#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x0090700fL -# error "OpenSSL >= 0.9.7 is required" +#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x0090700fL || OPENSSL_VERSION_NUMBER-0 >= 0x10100000L +# error "OpenSSL >= 0.9.7, and < 1.1.0 is required" #endif #include <openssl/ssl.h> |