diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2020-12-18 15:35:49 +0100 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2021-02-02 11:10:06 +0100 |
| commit | a3b58a7844f77bd416fad8307f8333ff7c0efacf (patch) | |
| tree | 83cd728441d5404a0088d07aae8f8b719feadeae /src/network | |
| parent | 1e3b0d92807323d9138478a66182dff4eaa86b20 (diff) | |
NetworkListManager based backend for QNetworkInformation
For Windows. Based on the code I wrote for QNetworkStatusMonitor.
It also renames the netlistmgr feature, avoiding the abbreviation.
Locally my MinGW fails the networklistmanager feature test so it may
not be supported on MinGW, likely leaving it without a backend at all.
Change-Id: I13bbe4127edc2a9c0bb91602c95f1cb206a85a69
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/network/configure.cmake | 8 | ||||
| -rw-r--r-- | src/network/configure.json | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 4ea9656ffb..9c9976441f 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -214,12 +214,12 @@ qt_internal_extend_target(Network CONDITION IOS OR MACOS ${FWSystemConfiguration} ) -qt_internal_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT IOS AND NOT MACOS +qt_internal_extend_target(Network CONDITION QT_FEATURE_networklistmanager AND NOT IOS AND NOT MACOS SOURCES kernel/qnetconmonitor_win.cpp ) -qt_internal_extend_target(Network CONDITION NOT IOS AND NOT MACOS AND NOT QT_FEATURE_netlistmgr +qt_internal_extend_target(Network CONDITION NOT IOS AND NOT MACOS AND NOT QT_FEATURE_networklistmanager SOURCES kernel/qnetconmonitor_stub.cpp ) diff --git a/src/network/configure.cmake b/src/network/configure.cmake index 84a3609d24..e89daaa8c4 100644 --- a/src/network/configure.cmake +++ b/src/network/configure.cmake @@ -204,8 +204,8 @@ int main(int argc, char **argv) } ") -# netlistmgr -qt_config_compile_test(netlistmgr +# networklistmanager +qt_config_compile_test(networklistmanager LABEL "Network List Manager" CODE " @@ -387,11 +387,11 @@ qt_feature("sspi" PUBLIC CONDITION WIN32 ) qt_feature_definition("sspi" "QT_NO_SSPI" NEGATE VALUE "1") -qt_feature("netlistmgr" PRIVATE +qt_feature("networklistmanager" PRIVATE SECTION "Networking" LABEL "Network List Manager" PURPOSE "Use Network List Manager to keep track of network connectivity" - CONDITION WIN32 AND TEST_netlistmgr + CONDITION WIN32 AND TEST_networklistmanager ) qt_feature("topleveldomain" PUBLIC SECTION "Networking" diff --git a/src/network/configure.json b/src/network/configure.json index 95798516e7..b037eee75c 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -214,7 +214,7 @@ }, "use": "openssl" }, - "netlistmgr": { + "networklistmanager": { "label": "Network List Manager", "type": "compile", "test": { @@ -407,11 +407,11 @@ "condition": "config.win32", "output": [ "publicFeature", "feature" ] }, - "netlistmgr": { + "networklistmanager": { "label": "Network List Manager", "purpose": "Use Network List Manager to keep track of network connectivity", "section": "Networking", - "condition": "config.win32 && tests.netlistmgr", + "condition": "config.win32 && tests.networklistmanager", "output": [ "privateFeature" ] }, "topleveldomain": { |