1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SSL configure test: Fix confusing warning

Browse Source 
Remove quote character, fixing:

Performing C++ SOURCE FILE Test HAVE_openssl_headers succeeded with the following output:
Run Build Command(s)
src.cxx 8 88: warning: missing terminating ' character
    8 | #  error OpenSSL was reported as >= 1.1.1 but is missing required features, possibly it's libressl which is unsupported

which makes one think the test failed.

Change-Id: I0ac02deee4282ef7c953186b820a31309e82b5e1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Friedemann Kleint 2020-06-25 15:41:08 +02:00
parent d8bf71026c
commit 7789c0dc86
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/configure.cmake
View File

@ -20,7 +20,7 @@ qt_config_compile_test(openssl_headers
# error OpenSSL >= 1.1.1 is required # error OpenSSL >= 1.1.1 is required
#endif #endif
#if !defined(OPENSSL_NO_EC) && !defined(SSL_CTRL_SET_CURVES) #if !defined(OPENSSL_NO_EC) && !defined(SSL_CTRL_SET_CURVES)
# error OpenSSL was reported as >= 1.1.1 but is missing required features, possibly it's libressl which is unsupported # error OpenSSL was reported as >= 1.1.1 but is missing required features, possibly it is libressl which is unsupported
#endif #endif
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
@ -45,7 +45,7 @@ qt_config_compile_test(openssl
# error OpenSSL >= 1.1.1 is required # error OpenSSL >= 1.1.1 is required
#endif #endif
#if !defined(OPENSSL_NO_EC) && !defined(SSL_CTRL_SET_CURVES) #if !defined(OPENSSL_NO_EC) && !defined(SSL_CTRL_SET_CURVES)
# error OpenSSL was reported as >= 1.1.1 but is missing required features, possibly it's libressl which is unsupported # error OpenSSL was reported as >= 1.1.1 but is missing required features, possibly it is libressl which is unsupported
#endif #endif
int main(int argc, char **argv) int main(int argc, char **argv)
{ {

2
src/network/configure.json
View File

@ -65,7 +65,7 @@
"# error OpenSSL >= 1.1.1 is required", "# error OpenSSL >= 1.1.1 is required",
"#endif", "#endif",
"#if !defined(OPENSSL_NO_EC) && !defined(SSL_CTRL_SET_CURVES)", "#if !defined(OPENSSL_NO_EC) && !defined(SSL_CTRL_SET_CURVES)",
"# error OpenSSL was reported as >= 1.1.1 but is missing required features, possibly it's libressl which is unsupported", "# error OpenSSL was reported as >= 1.1.1 but is missing required features, possibly it is libressl which is unsupported",
"#endif" "#endif"
] ]
}, },