diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-21 01:00:08 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-21 01:00:09 +0200 |
| commit | 7a252ac46780b6145084d8d5ca0549b2de3639cc (patch) | |
| tree | e8a938a26fb610e0eaba62dcf185b2e361f01951 /config.tests | |
| parent | 10b8ed816d0dff4321d5a8b0723a8090b2058678 (diff) | |
| parent | 2708c6c11d685ab25c12d558961d924c9a4533d2 (diff) | |
| download | qtbase-7a252ac46780b6145084d8d5ca0549b2de3639cc.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Iaf28977e7ecf566b28b9406dcb005d48621169c2
Diffstat (limited to 'config.tests')
| -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..9188fb008f 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 < 0x10000000L +# error "OpenSSL >= 1.0.0 is required" #endif #include <openssl/ssl.h> |