Merge remote-tracking branch 'origin/dev' into wip/cmake

Take 5.

Change-Id: Ifb2d20e95ba824e45e667fba6c2ba45389991cc3

1 files changed, 13 insertions, 0 deletions

diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt
index d48c3920fc..1b901d3050 100644
--- a/src/network/.prev_CMakeLists.txt
+++ b/src/network/.prev_CMakeLists.txt
@@ -33,6 +33,7 @@ add_qt_module(Network
         kernel/qauthenticator.cpp kernel/qauthenticator.h kernel/qauthenticator_p.h
         kernel/qhostaddress.cpp kernel/qhostaddress.h kernel/qhostaddress_p.h
         kernel/qhostinfo.cpp kernel/qhostinfo.h kernel/qhostinfo_p.h
+        kernel/qnetconmonitor_p.h
         kernel/qnetworkdatagram.cpp kernel/qnetworkdatagram.h kernel/qnetworkdatagram_p.h
         kernel/qnetworkinterface.cpp kernel/qnetworkinterface.h kernel/qnetworkinterface_p.h
         kernel/qnetworkinterface_unix_p.h
@@ -213,6 +214,18 @@ extend_target(Network CONDITION APPLE_OSX AND NOT APPLE_UIKIT
         ${FWSystemConfiguration}
 )
 
+extend_target(Network CONDITION APPLE_IOS OR APPLE_OSX
+    SOURCES
+        kernel/qnetconmonitor_darwin.mm
+    LIBRARIES
+        ${FWSystemConfiguration}
+)
+
+extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_OSX
+    SOURCES
+        kernel/qnetconmonitor_stub.cpp
+)
+
 extend_target(Network CONDITION QT_FEATURE_gssapi
     LIBRARIES
         gssapi_krb5