Merge branch 'wip/qt6' into wip/cmake

Change-Id: I50ac36b8803c296998149e98cc61e38687cdd14b

1 files changed, 13 insertions, 5 deletions

diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index 3148c00704..85ee368df5 100644
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -108,9 +108,7 @@ extend_target(Network CONDITION QT_FEATURE_settings
         access/qhstsstore.cpp access/qhstsstore_p.h
 )
 
-extend_target(Network CONDITION APPLE_OSX
-    SOURCES
-        kernel/qnetworkproxy_mac.cpp
+extend_target(Network CONDITION APPLE
     LIBRARIES
         ${FWCoreFoundation}
         ${FWSecurity}
@@ -220,7 +218,7 @@ extend_target(Network CONDITION QT_FEATURE_dnslookup AND WINRT
         kernel/qdnslookup_winrt.cpp
 )
 
-extend_target(Network CONDITION APPLE_OSX AND NOT APPLE_UIKIT
+extend_target(Network CONDITION APPLE AND NOT APPLE_UIKIT
     LIBRARIES
         ${FWCoreServices}
         ${FWSystemConfiguration}
@@ -233,7 +231,12 @@ extend_target(Network CONDITION APPLE_IOS OR APPLE_OSX
         ${FWSystemConfiguration}
 )
 
-extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_OSX
+extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT APPLE_IOS AND NOT APPLE_OSX
+    SOURCES
+        kernel/qnetconmonitor_win.cpp
+)
+
+extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_OSX AND NOT QT_FEATURE_netlistmgr
     SOURCES
         kernel/qnetconmonitor_stub.cpp
 )
@@ -248,6 +251,11 @@ extend_target(Network CONDITION APPLE_UIKIT
         kernel/qnetworkinterface_uikit_p.h
 )
 
+extend_target(Network CONDITION APPLE_OSX
+    SOURCES
+        kernel/qnetworkproxy_mac.cpp
+)
+
 extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_OSX AND (UNIX OR WINRT)
     SOURCES
         kernel/qnetworkproxy_libproxy.cpp