diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-23 12:07:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-23 10:17:48 +0000 |
| commit | a3670dd982f83d5eaf4990ec202af4ce61c2f164 (patch) | |
| tree | 715d791d88f4ead971accbd672eea21b4884e290 /config.tests | |
| parent | 1288c5b0bbdb51cf4467c84cc9bfd5b03972b5c5 (diff) | |
| parent | 81b29a44d248b5037a2f05dd8815e000d9472f0e (diff) | |
Merge remote-tracking branch 'origin/5.9.7' into 5.9
Conflicts:
config.tests/openssl/openssl.cpp
src/plugins/platforms/windows/qwindowsintegration.cpp
Change-Id: I93ad86751693f4f64981f1c3723bac2061c05379
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 9188fb008f..bb4010437a 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 < 0x10000000L -# error "OpenSSL >= 1.0.0 is required" +#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10000000L || OPENSSL_VERSION_NUMBER-0 >= 0x10100000L +# error "OpenSSL >= 1.0.0, and < 1.1.0 is required" #endif #include <openssl/ssl.h> |