CMake: Regenerate configure.cmake files

And adjust configure.json files that were stale

Amends d385158d5213ef568b7629e2aa4a818016bbffac

Change-Id: I851838a12c3773a6e8119ebc7f1de941ae7fe224
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexandru Croitor 2021-04-27 16:53:47 +02:00
parent a67002dc5b
commit 9cc9ef232d
5 changed files with 27 additions and 9 deletions

View File

@ -133,7 +133,7 @@ qt_config_linker_supports_flag_test(gdb_index
qt_config_compile_test(reduce_relocations qt_config_compile_test(reduce_relocations
LABEL "-Bsymbolic-functions support" LABEL "-Bsymbolic-functions support"
CODE CODE
"#if !(defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) || defined(__amd64)) "#if !(defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) || defined(__amd64)) || defined(__sun)
# error Symbolic function binding on this architecture may be broken, disabling it (see QTBUG-36129). # error Symbolic function binding on this architecture may be broken, disabling it (see QTBUG-36129).
#endif #endif

View File

@ -795,7 +795,7 @@ qt_feature("xcb" PRIVATE
AUTODETECT NOT APPLE AUTODETECT NOT APPLE
CONDITION QT_FEATURE_thread AND TARGET XCB::XCB AND TEST_xcb_syslibs AND QT_FEATURE_xkbcommon_x11 CONDITION QT_FEATURE_thread AND TARGET XCB::XCB AND TEST_xcb_syslibs AND QT_FEATURE_xkbcommon_x11
) )
qt_feature("xcb-glx-plugin" PRIVATE qt_feature("xcb-glx-plugin" PUBLIC
LABEL "GLX Plugin" LABEL "GLX Plugin"
CONDITION QT_FEATURE_xcb_xlib AND QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 CONDITION QT_FEATURE_xcb_xlib AND QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2
EMIT_IF QT_FEATURE_xcb EMIT_IF QT_FEATURE_xcb

View File

@ -81,6 +81,22 @@ freeifaddrs(list);
"# FIXME: use: unmapped library: network "# FIXME: use: unmapped library: network
) )
# ifr_index
qt_config_compile_test(ifr_index
LABEL "ifr_index"
CODE
"#include <net/if.h>
int main(void)
{
/* BEGIN TEST: */
struct ifreq req;
req.ifr_index = 0;
/* END TEST: */
return 0;
}
")
# ipv6ifname # ipv6ifname
qt_config_compile_test(ipv6ifname qt_config_compile_test(ipv6ifname
LABEL "IPv6 ifname" LABEL "IPv6 ifname"
@ -220,6 +236,10 @@ qt_feature("getifaddrs" PUBLIC
CONDITION TEST_getifaddrs CONDITION TEST_getifaddrs
) )
qt_feature_definition("getifaddrs" "QT_NO_GETIFADDRS" NEGATE VALUE "1") qt_feature_definition("getifaddrs" "QT_NO_GETIFADDRS" NEGATE VALUE "1")
qt_feature("ifr_index" PRIVATE
LABEL "ifr_index"
CONDITION TEST_ifr_index
)
qt_feature("ipv6ifname" PUBLIC qt_feature("ipv6ifname" PUBLIC
LABEL "IPv6 ifname" LABEL "IPv6 ifname"
CONDITION TEST_ipv6ifname CONDITION TEST_ipv6ifname
@ -243,27 +263,26 @@ qt_feature_definition("openssl" "QT_NO_OPENSSL" NEGATE)
qt_feature_config("openssl" QMAKE_PUBLIC_QT_CONFIG) qt_feature_config("openssl" QMAKE_PUBLIC_QT_CONFIG)
qt_feature("openssl-runtime" qt_feature("openssl-runtime"
AUTODETECT NOT WASM AUTODETECT NOT WASM
CONDITION NOT QT_FEATURE_securetransport AND NOT QT_FEATURE_schannel AND TEST_openssl_headers CONDITION TEST_openssl_headers
ENABLE INPUT_openssl STREQUAL 'yes' OR INPUT_openssl STREQUAL 'runtime' ENABLE INPUT_openssl STREQUAL 'yes' OR INPUT_openssl STREQUAL 'runtime'
DISABLE INPUT_openssl STREQUAL 'no' OR INPUT_openssl STREQUAL 'linked' OR INPUT_ssl STREQUAL 'no' DISABLE INPUT_openssl STREQUAL 'no' OR INPUT_openssl STREQUAL 'linked' OR INPUT_ssl STREQUAL 'no'
) )
qt_feature("openssl-linked" PRIVATE qt_feature("openssl-linked" PRIVATE
LABEL " Qt directly linked to OpenSSL" LABEL " Qt directly linked to OpenSSL"
AUTODETECT OFF AUTODETECT OFF
CONDITION NOT QT_FEATURE_securetransport AND NOT QT_FEATURE_schannel AND TEST_openssl CONDITION TEST_openssl
ENABLE INPUT_openssl STREQUAL 'linked' ENABLE INPUT_openssl STREQUAL 'linked'
) )
qt_feature_definition("openssl-linked" "QT_LINKED_OPENSSL") qt_feature_definition("openssl-linked" "QT_LINKED_OPENSSL")
qt_feature("securetransport" PUBLIC qt_feature("securetransport" PUBLIC
LABEL "SecureTransport" LABEL "SecureTransport"
CONDITION APPLE AND ( INPUT_openssl STREQUAL '' OR INPUT_openssl STREQUAL 'no' ) CONDITION APPLE
DISABLE INPUT_ssl STREQUAL 'no' DISABLE INPUT_ssl STREQUAL 'no'
) )
qt_feature_definition("securetransport" "QT_SECURETRANSPORT") qt_feature_definition("securetransport" "QT_SECURETRANSPORT")
qt_feature("schannel" PUBLIC qt_feature("schannel" PUBLIC
LABEL "Schannel" LABEL "Schannel"
AUTODETECT OFF CONDITION WIN32
CONDITION WIN32 AND ( INPUT_openssl STREQUAL '' OR INPUT_openssl STREQUAL 'no' )
DISABLE INPUT_ssl STREQUAL 'no' DISABLE INPUT_ssl STREQUAL 'no'
) )
qt_feature_definition("schannel" "QT_SCHANNEL") qt_feature_definition("schannel" "QT_SCHANNEL")

View File

@ -307,7 +307,6 @@
}, },
"schannel": { "schannel": {
"label": "Schannel", "label": "Schannel",
"autoDetect": false,
"disable": "input.ssl == 'no'", "disable": "input.ssl == 'no'",
"condition": "config.win32", "condition": "config.win32",
"output": [ "output": [