diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-04-27 16:53:47 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-04-27 21:33:48 +0200 |
| commit | 9cc9ef232d4d02827539ff7a2caaa0e187868e7f (patch) | |
| tree | 1855aa45e631d77968420ea5ec31a446a7748379 /src | |
| parent | a67002dc5b6fb9d2e35fb688b58e63c8a3260f14 (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/.prev_configure.cmake | 2 | ||||
| -rw-r--r-- | src/network/.prev_configure.cmake | 29 | ||||
| -rw-r--r-- | src/network/configure.json | 1 |
3 files changed, 25 insertions, 7 deletions
diff --git a/src/gui/.prev_configure.cmake b/src/gui/.prev_configure.cmake index 9ce8b6f45e..56dbde24b9 100644 --- a/src/gui/.prev_configure.cmake +++ b/src/gui/.prev_configure.cmake @@ -795,7 +795,7 @@ qt_feature("xcb" PRIVATE AUTODETECT NOT APPLE 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" CONDITION QT_FEATURE_xcb_xlib AND QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 EMIT_IF QT_FEATURE_xcb diff --git a/src/network/.prev_configure.cmake b/src/network/.prev_configure.cmake index 43bbbceab8..4cb10dea70 100644 --- a/src/network/.prev_configure.cmake +++ b/src/network/.prev_configure.cmake @@ -81,6 +81,22 @@ freeifaddrs(list); "# 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 qt_config_compile_test(ipv6ifname LABEL "IPv6 ifname" @@ -220,6 +236,10 @@ qt_feature("getifaddrs" PUBLIC CONDITION TEST_getifaddrs ) 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 LABEL "IPv6 ifname" 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("openssl-runtime" 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' DISABLE INPUT_openssl STREQUAL 'no' OR INPUT_openssl STREQUAL 'linked' OR INPUT_ssl STREQUAL 'no' ) qt_feature("openssl-linked" PRIVATE LABEL " Qt directly linked to OpenSSL" AUTODETECT OFF - CONDITION NOT QT_FEATURE_securetransport AND NOT QT_FEATURE_schannel AND TEST_openssl + CONDITION TEST_openssl ENABLE INPUT_openssl STREQUAL 'linked' ) qt_feature_definition("openssl-linked" "QT_LINKED_OPENSSL") qt_feature("securetransport" PUBLIC LABEL "SecureTransport" - CONDITION APPLE AND ( INPUT_openssl STREQUAL '' OR INPUT_openssl STREQUAL 'no' ) + CONDITION APPLE DISABLE INPUT_ssl STREQUAL 'no' ) qt_feature_definition("securetransport" "QT_SECURETRANSPORT") qt_feature("schannel" PUBLIC LABEL "Schannel" - AUTODETECT OFF - CONDITION WIN32 AND ( INPUT_openssl STREQUAL '' OR INPUT_openssl STREQUAL 'no' ) + CONDITION WIN32 DISABLE INPUT_ssl STREQUAL 'no' ) qt_feature_definition("schannel" "QT_SCHANNEL") diff --git a/src/network/configure.json b/src/network/configure.json index de1dce8fb4..54a323eb7a 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -307,7 +307,6 @@ }, "schannel": { "label": "Schannel", - "autoDetect": false, "disable": "input.ssl == 'no'", "condition": "config.win32", "output": [ |