7 files changed, 1233 insertions, 15 deletions
diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..1b901d3050
--- /dev/null
+++ b/src/network/.prev_CMakeLists.txt
@@ -0,0 +1,429 @@
+# Generated from network.pro.
+
+#####################################################################
+## Network Module:
+#####################################################################
+
+add_qt_module(Network
+    SOURCES
+        access/qabstractnetworkcache.cpp access/qabstractnetworkcache.h access/qabstractnetworkcache_p.h
+        access/qhsts.cpp access/qhsts_p.h
+        access/qhstspolicy.cpp access/qhstspolicy.h
+        access/qnetworkaccessauthenticationmanager.cpp access/qnetworkaccessauthenticationmanager_p.h
+        access/qnetworkaccessbackend.cpp access/qnetworkaccessbackend_p.h
+        access/qnetworkaccesscache.cpp access/qnetworkaccesscache_p.h
+        access/qnetworkaccesscachebackend.cpp access/qnetworkaccesscachebackend_p.h
+        access/qnetworkaccessdebugpipebackend.cpp access/qnetworkaccessdebugpipebackend_p.h
+        access/qnetworkaccessfilebackend.cpp access/qnetworkaccessfilebackend_p.h
+        access/qnetworkaccessmanager.cpp access/qnetworkaccessmanager.h access/qnetworkaccessmanager_p.h
+        access/qnetworkcookie.cpp access/qnetworkcookie.h access/qnetworkcookie_p.h
+        access/qnetworkcookiejar.cpp access/qnetworkcookiejar.h access/qnetworkcookiejar_p.h
+        access/qnetworkfile.cpp access/qnetworkfile_p.h
+        access/qnetworkreply.cpp access/qnetworkreply.h access/qnetworkreply_p.h
+        access/qnetworkreplydataimpl.cpp access/qnetworkreplydataimpl_p.h
+        access/qnetworkreplyfileimpl.cpp access/qnetworkreplyfileimpl_p.h
+        access/qnetworkreplyimpl.cpp access/qnetworkreplyimpl_p.h
+        access/qnetworkrequest.cpp access/qnetworkrequest.h access/qnetworkrequest_p.h
+        bearer/qbearerengine.cpp bearer/qbearerengine_p.h
+        bearer/qbearerplugin.cpp bearer/qbearerplugin_p.h
+        bearer/qnetworkconfigmanager.cpp bearer/qnetworkconfigmanager.h bearer/qnetworkconfigmanager_p.cpp bearer/qnetworkconfigmanager_p.h
+        bearer/qnetworkconfiguration.cpp bearer/qnetworkconfiguration.h bearer/qnetworkconfiguration_p.h
+        bearer/qnetworksession.cpp bearer/qnetworksession.h bearer/qnetworksession_p.h
+        bearer/qsharednetworksession.cpp bearer/qsharednetworksession_p.h
+        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
+        kernel/qnetworkproxy.cpp kernel/qnetworkproxy.h
+        kernel/qtnetworkglobal.h kernel/qtnetworkglobal_p.h
+        socket/qabstractsocket.cpp socket/qabstractsocket.h socket/qabstractsocket_p.h
+        socket/qabstractsocketengine.cpp socket/qabstractsocketengine_p.h
+        socket/qtcpserver.cpp socket/qtcpserver.h socket/qtcpserver_p.h
+        socket/qtcpsocket.cpp socket/qtcpsocket.h socket/qtcpsocket_p.h
+        socket/qudpsocket.cpp socket/qudpsocket.h
+        ssl/qasn1element.cpp ssl/qasn1element_p.h
+        ssl/qpassworddigestor.cpp ssl/qpassworddigestor.h
+        ssl/qssl.cpp ssl/qssl.h ssl/qssl_p.h
+        ssl/qsslcertificate.cpp ssl/qsslcertificate.h ssl/qsslcertificate_p.h
+        ssl/qsslcertificateextension.cpp ssl/qsslcertificateextension.h ssl/qsslcertificateextension_p.h
+    DEFINES
+        QT_NO_FOREACH
+        QT_NO_USING_NAMESPACE
+    INCLUDE_DIRECTORIES
+        kernel
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+#### Keys ignored in scope 1:.:.:network.pro:<TRUE>:
+# MODULE_PLUGIN_TYPES = "bearer"
+# MODULE_WINRT_CAPABILITIES = "internetClient" "internetClientServer" "privateNetworkClientServer"
+# QMAKE_LIBS = "$$QMAKE_LIBS_NETWORK"
+# _LOADED = "qt_module"
+
+## Scopes:
+#####################################################################
+
+extend_target(Network CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+    LINK_OPTIONS
+        "/BASE:0x64000000"
+)
+
+#### Keys ignored in scope 3:.:.:network.pro:QT_FEATURE_bearermanagement:
+# ANDROID_BUNDLED_JAR_DEPENDENCIES = "jar/QtAndroidBearer.jar"
+# ANDROID_LIB_DEPENDENCIES = "plugins/bearer/libqandroidbearer.so"
+# ANDROID_PERMISSIONS = "android.permission.ACCESS_NETWORK_STATE"
+# MODULE_PLUGIN_TYPES = "bearer"
+
+extend_target(Network CONDITION QT_FEATURE_ftp
+    SOURCES
+        access/qftp.cpp access/qftp_p.h
+        access/qnetworkaccessftpbackend.cpp access/qnetworkaccessftpbackend_p.h
+        kernel/qurlinfo.cpp kernel/qurlinfo_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_networkdiskcache
+    SOURCES
+        access/qnetworkdiskcache.cpp access/qnetworkdiskcache.h access/qnetworkdiskcache_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_settings
+    SOURCES
+        access/qhstsstore.cpp access/qhstsstore_p.h
+)
+
+extend_target(Network CONDITION APPLE_OSX
+    SOURCES
+        kernel/qnetworkproxy_mac.cpp
+    LIBRARIES
+        ${FWCoreFoundation}
+        ${FWSecurity}
+)
+
+extend_target(Network CONDITION WASM
+    SOURCES
+        access/qnetworkreplywasmimpl.cpp access/qnetworkreplywasmimpl_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_http
+    SOURCES
+        access/http2/bitstreams.cpp access/http2/bitstreams_p.h
+        access/http2/hpack.cpp access/http2/hpack_p.h
+        access/http2/hpacktable.cpp access/http2/hpacktable_p.h
+        access/http2/http2frames.cpp access/http2/http2frames_p.h
+        access/http2/http2protocol.cpp access/http2/http2protocol_p.h
+        access/http2/http2streams.cpp access/http2/http2streams_p.h
+        access/http2/huffman.cpp access/http2/huffman_p.h
+        access/qabstractprotocolhandler.cpp access/qabstractprotocolhandler_p.h
+        access/qhttp2protocolhandler.cpp access/qhttp2protocolhandler_p.h
+        access/qhttpmultipart.cpp access/qhttpmultipart.h access/qhttpmultipart_p.h
+        access/qhttpnetworkconnection.cpp access/qhttpnetworkconnection_p.h
+        access/qhttpnetworkconnectionchannel.cpp access/qhttpnetworkconnectionchannel_p.h
+        access/qhttpnetworkheader.cpp access/qhttpnetworkheader_p.h
+        access/qhttpnetworkreply.cpp access/qhttpnetworkreply_p.h
+        access/qhttpnetworkrequest.cpp access/qhttpnetworkrequest_p.h
+        access/qhttpprotocolhandler.cpp access/qhttpprotocolhandler_p.h
+        access/qhttpthreaddelegate.cpp access/qhttpthreaddelegate_p.h
+        access/qnetworkreplyhttpimpl.cpp access/qnetworkreplyhttpimpl_p.h
+        socket/qhttpsocketengine.cpp socket/qhttpsocketengine_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_http AND QT_FEATURE_ssl
+    SOURCES
+        access/qspdyprotocolhandler.cpp access/qspdyprotocolhandler_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_dnslookup
+    SOURCES
+        kernel/qdnslookup.cpp kernel/qdnslookup.h kernel/qdnslookup_p.h
+)
+
+extend_target(Network CONDITION UNIX
+    SOURCES
+        kernel/qhostinfo_unix.cpp
+        socket/qnativesocketengine_unix.cpp
+        socket/qnet_unix_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT INTEGRITY
+    SOURCES
+        kernel/qdnslookup_unix.cpp
+)
+
+extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX
+    LIBRARIES
+        ${CMAKE_DL_LIBS}
+)
+
+extend_target(Network CONDITION QT_FEATURE_linux_netlink AND UNIX
+    SOURCES
+        kernel/qnetworkinterface_linux.cpp
+)
+
+extend_target(Network CONDITION UNIX AND NOT QT_FEATURE_linux_netlink
+    SOURCES
+        kernel/qnetworkinterface_unix.cpp
+)
+
+extend_target(Network CONDITION ANDROID AND QT_FEATURE_dnslookup
+    SOURCES
+        -kernel/qdnslookup_unix.cpp
+        kernel/qdnslookup_android.cpp
+)
+
+extend_target(Network CONDITION WIN32
+    SOURCES
+        kernel/qhostinfo_win.cpp
+)
+
+extend_target(Network CONDITION WIN32 AND NOT WINRT
+    SOURCES
+        kernel/qnetworkinterface_win.cpp
+        kernel/qnetworkproxy_win.cpp
+        socket/qnativesocketengine_win.cpp
+    LIBRARIES
+        advapi32
+        dnsapi
+        iphlpapi
+)
+
+extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32 AND NOT WINRT
+    SOURCES
+        kernel/qdnslookup_win.cpp
+)
+
+extend_target(Network CONDITION WINRT
+    SOURCES
+        kernel/qnetworkinterface_winrt.cpp
+        socket/qnativesocketengine_winrt.cpp socket/qnativesocketengine_winrt_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_dnslookup AND WINRT
+    SOURCES
+        kernel/qdnslookup_winrt.cpp
+)
+
+extend_target(Network CONDITION APPLE_OSX AND NOT APPLE_UIKIT
+    LIBRARIES
+        ${FWCoreServices}
+        ${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
+)
+
+extend_target(Network CONDITION APPLE_UIKIT
+    SOURCES
+        kernel/qnetworkinterface_uikit_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_OSX AND (UNIX OR WINRT)
+    SOURCES
+        kernel/qnetworkproxy_libproxy.cpp
+    LIBRARIES
+        ${CMAKE_DL_LIBS}
+        PkgConfig::Libproxy
+)
+
+extend_target(Network CONDITION NOT APPLE_OSX AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT)
+    SOURCES
+        kernel/qnetworkproxy_generic.cpp
+)
+
+extend_target(Network CONDITION QT_FEATURE_socks5
+    SOURCES
+        socket/qsocks5socketengine.cpp socket/qsocks5socketengine_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_sctp
+    SOURCES
+        socket/qsctpserver.cpp socket/qsctpserver.h socket/qsctpserver_p.h
+        socket/qsctpsocket.cpp socket/qsctpsocket.h socket/qsctpsocket_p.h
+)
+
+extend_target(Network CONDITION NOT WINRT
+    SOURCES
+        socket/qnativesocketengine.cpp socket/qnativesocketengine_p.h
+)
+
+extend_target(Network CONDITION MSVC
+    MOC_OPTIONS
+        "-D_WINSOCK_DEPRECATED_NO_WARNINGS"
+)
+
+extend_target(Network CONDITION QT_FEATURE_localserver
+    SOURCES
+        socket/qlocalserver.cpp socket/qlocalserver.h socket/qlocalserver_p.h
+        socket/qlocalsocket.cpp socket/qlocalsocket.h socket/qlocalsocket_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_localserver AND (INTEGRITY OR WINRT)
+    SOURCES
+        socket/qlocalserver_tcp.cpp
+        socket/qlocalsocket_tcp.cpp
+    DEFINES
+        QT_LOCALSOCKET_TCP
+)
+
+extend_target(Network CONDITION QT_FEATURE_localserver AND UNIX AND NOT INTEGRITY AND NOT WINRT
+    SOURCES
+        socket/qlocalserver_unix.cpp
+        socket/qlocalsocket_unix.cpp
+)
+
+extend_target(Network CONDITION QT_FEATURE_localserver AND WIN32 AND NOT WINRT
+    SOURCES
+        socket/qlocalserver_win.cpp
+        socket/qlocalsocket_win.cpp
+)
+
+extend_target(Network CONDITION QT_FEATURE_system_proxies
+    DEFINES
+        QT_USE_SYSTEM_PROXIES
+)
+
+extend_target(Network CONDITION NOT QT_FEATURE_openssl
+    SOURCES
+        ssl/qsslcertificate_qt.cpp
+)
+
+extend_target(Network CONDITION QT_FEATURE_ssl
+    SOURCES
+        ssl/qocspresponse.cpp ssl/qocspresponse.h ssl/qocspresponse_p.h
+        ssl/qsslcipher.cpp ssl/qsslcipher.h ssl/qsslcipher_p.h
+        ssl/qsslconfiguration.cpp ssl/qsslconfiguration.h ssl/qsslconfiguration_p.h
+        ssl/qssldiffiehellmanparameters.cpp ssl/qssldiffiehellmanparameters.h ssl/qssldiffiehellmanparameters_p.h
+        ssl/qsslellipticcurve.cpp ssl/qsslellipticcurve.h
+        ssl/qsslerror.cpp ssl/qsslerror.h
+        ssl/qsslkey.h ssl/qsslkey_p.cpp ssl/qsslkey_p.h
+        ssl/qsslpresharedkeyauthenticator.cpp ssl/qsslpresharedkeyauthenticator.h ssl/qsslpresharedkeyauthenticator_p.h
+        ssl/qsslsocket.cpp ssl/qsslsocket.h ssl/qsslsocket_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_ssl AND WINRT
+    SOURCES
+        ssl/qsslcertificate_winrt.cpp
+        ssl/qssldiffiehellmanparameters_dummy.cpp
+        ssl/qsslellipticcurve_dummy.cpp
+        ssl/qsslkey_qt.cpp
+        ssl/qsslkey_winrt.cpp
+        ssl/qsslsocket_winrt.cpp ssl/qsslsocket_winrt_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qsslcertificate_schannel.cpp
+        ssl/qssldiffiehellmanparameters_dummy.cpp
+        ssl/qsslellipticcurve_dummy.cpp
+        ssl/qsslkey_qt.cpp
+        ssl/qsslkey_schannel.cpp
+        ssl/qsslsocket_qt.cpp
+        ssl/qsslsocket_schannel.cpp ssl/qsslsocket_schannel_p.h
+    LIBRARIES
+        Crypt32
+        Secur32
+        bcrypt
+        ncrypt
+)
+
+extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qssldiffiehellmanparameters_dummy.cpp
+        ssl/qsslellipticcurve_dummy.cpp
+        ssl/qsslkey_mac.cpp
+        ssl/qsslkey_qt.cpp
+        ssl/qsslsocket_mac.cpp ssl/qsslsocket_mac_p.h
+        ssl/qsslsocket_mac_shared.cpp
+        ssl/qsslsocket_qt.cpp
+)
+
+extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qdtls.cpp ssl/qdtls.h ssl/qdtls_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qsslcertificate_openssl.cpp
+        ssl/qsslcontext_openssl.cpp ssl/qsslcontext_openssl_p.h
+        ssl/qssldiffiehellmanparameters_openssl.cpp
+        ssl/qsslellipticcurve_openssl.cpp
+        ssl/qsslkey_openssl.cpp
+        ssl/qsslsocket_openssl.cpp ssl/qsslsocket_openssl_p.h
+        ssl/qsslsocket_openssl_symbols.cpp ssl/qsslsocket_openssl_symbols_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_openssl AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qdtls_openssl.cpp ssl/qdtls_openssl_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_ocsp AND QT_FEATURE_openssl AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qocsp_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_opensslv11 AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qsslcontext_openssl11.cpp
+        ssl/qsslsocket_openssl11.cpp
+        ssl/qsslsocket_openssl11_symbols_p.h
+    DEFINES
+        OPENSSL_API_COMPAT=0x10100000L
+)
+
+extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_opensslv11
+    SOURCES
+        ssl/qsslcontext_opensslpre11.cpp
+        ssl/qsslsocket_opensslpre11.cpp
+        ssl/qsslsocket_opensslpre11_symbols_p.h
+)
+
+extend_target(Network CONDITION APPLE AND QT_FEATURE_openssl AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qsslsocket_mac_shared.cpp
+)
+
+extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT ANDROID_EMBEDDED
+    SOURCES
+        ssl/qsslsocket_openssl_android.cpp
+)
+
+extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl
+    LIBRARIES
+        OpenSSL::SSL
+)
+
+extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked
+    LIBRARIES
+        OpenSSL::SSL_nolink
+)
+
+extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32
+    SOURCES
+        ssl/qwindowscarootfetcher.cpp ssl/qwindowscarootfetcher_p.h
+    LIBRARIES
+        crypt32
+)
+add_qt_docs(
+    doc/qtnetwork.qdocconf
+)
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
new file mode 100644
index 0000000000..414a41581b
--- /dev/null
+++ b/src/network/CMakeLists.txt
@@ -0,0 +1,441 @@
+# Generated from network.pro.
+
+#####################################################################
+## Network Module:
+#####################################################################
+
+add_qt_module(Network
+    SOURCES
+        access/qabstractnetworkcache.cpp access/qabstractnetworkcache.h access/qabstractnetworkcache_p.h
+        access/qhsts.cpp access/qhsts_p.h
+        access/qhstspolicy.cpp access/qhstspolicy.h
+        access/qnetworkaccessauthenticationmanager.cpp access/qnetworkaccessauthenticationmanager_p.h
+        access/qnetworkaccessbackend.cpp access/qnetworkaccessbackend_p.h
+        access/qnetworkaccesscache.cpp access/qnetworkaccesscache_p.h
+        access/qnetworkaccesscachebackend.cpp access/qnetworkaccesscachebackend_p.h
+        access/qnetworkaccessdebugpipebackend.cpp access/qnetworkaccessdebugpipebackend_p.h
+        access/qnetworkaccessfilebackend.cpp access/qnetworkaccessfilebackend_p.h
+        access/qnetworkaccessmanager.cpp access/qnetworkaccessmanager.h access/qnetworkaccessmanager_p.h
+        access/qnetworkcookie.cpp access/qnetworkcookie.h access/qnetworkcookie_p.h
+        access/qnetworkcookiejar.cpp access/qnetworkcookiejar.h access/qnetworkcookiejar_p.h
+        access/qnetworkfile.cpp access/qnetworkfile_p.h
+        access/qnetworkreply.cpp access/qnetworkreply.h access/qnetworkreply_p.h
+        access/qnetworkreplydataimpl.cpp access/qnetworkreplydataimpl_p.h
+        access/qnetworkreplyfileimpl.cpp access/qnetworkreplyfileimpl_p.h
+        access/qnetworkreplyimpl.cpp access/qnetworkreplyimpl_p.h
+        access/qnetworkrequest.cpp access/qnetworkrequest.h access/qnetworkrequest_p.h
+        bearer/qbearerengine.cpp bearer/qbearerengine_p.h
+        bearer/qbearerplugin.cpp bearer/qbearerplugin_p.h
+        bearer/qnetworkconfigmanager.cpp bearer/qnetworkconfigmanager.h bearer/qnetworkconfigmanager_p.cpp bearer/qnetworkconfigmanager_p.h
+        bearer/qnetworkconfiguration.cpp bearer/qnetworkconfiguration.h bearer/qnetworkconfiguration_p.h
+        bearer/qnetworksession.cpp bearer/qnetworksession.h bearer/qnetworksession_p.h
+        bearer/qsharednetworksession.cpp bearer/qsharednetworksession_p.h
+        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
+        kernel/qnetworkproxy.cpp kernel/qnetworkproxy.h
+        kernel/qtnetworkglobal.h kernel/qtnetworkglobal_p.h
+        socket/qabstractsocket.cpp socket/qabstractsocket.h socket/qabstractsocket_p.h
+        socket/qabstractsocketengine.cpp socket/qabstractsocketengine_p.h
+        socket/qtcpserver.cpp socket/qtcpserver.h socket/qtcpserver_p.h
+        socket/qtcpsocket.cpp socket/qtcpsocket.h socket/qtcpsocket_p.h
+        socket/qudpsocket.cpp socket/qudpsocket.h
+        ssl/qasn1element.cpp ssl/qasn1element_p.h
+        ssl/qpassworddigestor.cpp ssl/qpassworddigestor.h
+        ssl/qssl.cpp ssl/qssl.h ssl/qssl_p.h
+        ssl/qsslcertificate.cpp ssl/qsslcertificate.h ssl/qsslcertificate_p.h
+        ssl/qsslcertificateextension.cpp ssl/qsslcertificateextension.h ssl/qsslcertificateextension_p.h
+    DEFINES
+        QT_NO_FOREACH
+        QT_NO_USING_NAMESPACE
+    INCLUDE_DIRECTORIES
+        kernel
+    LIBRARIES
+        Qt::CorePrivate
+        ZLIB::ZLIB # special case
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+#### Keys ignored in scope 1:.:.:network.pro:<TRUE>:
+# MODULE_PLUGIN_TYPES = "bearer"
+# MODULE_WINRT_CAPABILITIES = "internetClient" "internetClientServer" "privateNetworkClientServer"
+# QMAKE_LIBS = "$$QMAKE_LIBS_NETWORK"
+# _LOADED = "qt_module"
+
+## Scopes:
+#####################################################################
+
+extend_target(Network CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+    LINK_OPTIONS
+        "/BASE:0x64000000"
+)
+
+#### Keys ignored in scope 3:.:.:network.pro:QT_FEATURE_bearermanagement:
+# ANDROID_BUNDLED_JAR_DEPENDENCIES = "jar/QtAndroidBearer.jar"
+# ANDROID_LIB_DEPENDENCIES = "plugins/bearer/libqandroidbearer.so"
+# ANDROID_PERMISSIONS = "android.permission.ACCESS_NETWORK_STATE"
+# MODULE_PLUGIN_TYPES = "bearer"
+
+extend_target(Network CONDITION QT_FEATURE_ftp
+    SOURCES
+        access/qftp.cpp access/qftp_p.h
+        access/qnetworkaccessftpbackend.cpp access/qnetworkaccessftpbackend_p.h
+        kernel/qurlinfo.cpp kernel/qurlinfo_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_networkdiskcache
+    SOURCES
+        access/qnetworkdiskcache.cpp access/qnetworkdiskcache.h access/qnetworkdiskcache_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_settings
+    SOURCES
+        access/qhstsstore.cpp access/qhstsstore_p.h
+)
+
+extend_target(Network CONDITION APPLE_OSX
+    SOURCES
+        kernel/qnetworkproxy_mac.cpp
+    LIBRARIES
+        ${FWCoreFoundation}
+        ${FWSecurity}
+)
+
+extend_target(Network CONDITION WASM
+    SOURCES
+        access/qnetworkreplywasmimpl.cpp access/qnetworkreplywasmimpl_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_http
+    SOURCES
+        access/http2/bitstreams.cpp access/http2/bitstreams_p.h
+        access/http2/hpack.cpp access/http2/hpack_p.h
+        access/http2/hpacktable.cpp access/http2/hpacktable_p.h
+        access/http2/http2frames.cpp access/http2/http2frames_p.h
+        access/http2/http2protocol.cpp access/http2/http2protocol_p.h
+        access/http2/http2streams.cpp access/http2/http2streams_p.h
+        access/http2/huffman.cpp access/http2/huffman_p.h
+        access/qabstractprotocolhandler.cpp access/qabstractprotocolhandler_p.h
+        access/qhttp2protocolhandler.cpp access/qhttp2protocolhandler_p.h
+        access/qhttpmultipart.cpp access/qhttpmultipart.h access/qhttpmultipart_p.h
+        access/qhttpnetworkconnection.cpp access/qhttpnetworkconnection_p.h
+        access/qhttpnetworkconnectionchannel.cpp access/qhttpnetworkconnectionchannel_p.h
+        access/qhttpnetworkheader.cpp access/qhttpnetworkheader_p.h
+        access/qhttpnetworkreply.cpp access/qhttpnetworkreply_p.h
+        access/qhttpnetworkrequest.cpp access/qhttpnetworkrequest_p.h
+        access/qhttpprotocolhandler.cpp access/qhttpprotocolhandler_p.h
+        access/qhttpthreaddelegate.cpp access/qhttpthreaddelegate_p.h
+        access/qnetworkreplyhttpimpl.cpp access/qnetworkreplyhttpimpl_p.h
+        socket/qhttpsocketengine.cpp socket/qhttpsocketengine_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_http AND QT_FEATURE_ssl
+    SOURCES
+        access/qspdyprotocolhandler.cpp access/qspdyprotocolhandler_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_dnslookup
+    SOURCES
+        kernel/qdnslookup.cpp kernel/qdnslookup.h kernel/qdnslookup_p.h
+)
+
+extend_target(Network CONDITION UNIX
+    SOURCES
+        kernel/qhostinfo_unix.cpp
+        socket/qnativesocketengine_unix.cpp
+        socket/qnet_unix_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT INTEGRITY
+    SOURCES
+        kernel/qdnslookup_unix.cpp
+)
+
+extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX
+    LIBRARIES
+        ${CMAKE_DL_LIBS}
+)
+
+# special case begin
+# Do not add this to android!
+extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT INTEGRITY AND NOT ANDROID
+    SOURCES
+        kernel/qdnslookup_unix.cpp
+)
+# special case end
+
+extend_target(Network CONDITION QT_FEATURE_linux_netlink AND UNIX
+    SOURCES
+        kernel/qnetworkinterface_linux.cpp
+)
+
+extend_target(Network CONDITION UNIX AND NOT QT_FEATURE_linux_netlink
+    SOURCES
+        kernel/qnetworkinterface_unix.cpp
+)
+
+extend_target(Network CONDITION ANDROID AND QT_FEATURE_dnslookup
+    SOURCES
+        # kernel/qdnslookup_unix.cpp # special case: No more need to remove this
+        kernel/qdnslookup_android.cpp
+)
+
+extend_target(Network CONDITION WIN32
+    SOURCES
+        kernel/qhostinfo_win.cpp
+)
+
+extend_target(Network CONDITION WIN32 AND NOT WINRT
+    SOURCES
+        kernel/qnetworkinterface_win.cpp
+        kernel/qnetworkproxy_win.cpp
+        socket/qnativesocketengine_win.cpp
+    LIBRARIES
+        advapi32
+        dnsapi
+        iphlpapi
+)
+
+extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32 AND NOT WINRT
+    SOURCES
+        kernel/qdnslookup_win.cpp
+)
+
+extend_target(Network CONDITION WINRT
+    SOURCES
+        kernel/qnetworkinterface_winrt.cpp
+        socket/qnativesocketengine_winrt.cpp socket/qnativesocketengine_winrt_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_dnslookup AND WINRT
+    SOURCES
+        kernel/qdnslookup_winrt.cpp
+)
+
+extend_target(Network CONDITION APPLE_OSX AND NOT APPLE_UIKIT
+    LIBRARIES
+        ${FWCoreServices}
+        ${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
+)
+
+extend_target(Network CONDITION APPLE_UIKIT
+    SOURCES
+        kernel/qnetworkinterface_uikit_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_OSX AND (UNIX OR WINRT)
+    SOURCES
+        kernel/qnetworkproxy_libproxy.cpp
+    LIBRARIES
+        ${CMAKE_DL_LIBS}
+        PkgConfig::Libproxy
+)
+
+extend_target(Network CONDITION NOT APPLE_OSX AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT)
+    SOURCES
+        kernel/qnetworkproxy_generic.cpp
+)
+
+extend_target(Network CONDITION QT_FEATURE_socks5
+    SOURCES
+        socket/qsocks5socketengine.cpp socket/qsocks5socketengine_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_sctp
+    SOURCES
+        socket/qsctpserver.cpp socket/qsctpserver.h socket/qsctpserver_p.h
+        socket/qsctpsocket.cpp socket/qsctpsocket.h socket/qsctpsocket_p.h
+)
+
+extend_target(Network CONDITION NOT WINRT
+    SOURCES
+        socket/qnativesocketengine.cpp socket/qnativesocketengine_p.h
+)
+
+extend_target(Network CONDITION MSVC
+    MOC_OPTIONS
+        "-D_WINSOCK_DEPRECATED_NO_WARNINGS"
+)
+
+extend_target(Network CONDITION QT_FEATURE_localserver
+    SOURCES
+        socket/qlocalserver.cpp socket/qlocalserver.h socket/qlocalserver_p.h
+        socket/qlocalsocket.cpp socket/qlocalsocket.h socket/qlocalsocket_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_localserver AND (INTEGRITY OR WINRT)
+    SOURCES
+        socket/qlocalserver_tcp.cpp
+        socket/qlocalsocket_tcp.cpp
+    DEFINES
+        QT_LOCALSOCKET_TCP
+)
+
+extend_target(Network CONDITION QT_FEATURE_localserver AND UNIX AND NOT INTEGRITY AND NOT WINRT
+    SOURCES
+        socket/qlocalserver_unix.cpp
+        socket/qlocalsocket_unix.cpp
+)
+
+extend_target(Network CONDITION QT_FEATURE_localserver AND WIN32 AND NOT WINRT
+    SOURCES
+        socket/qlocalserver_win.cpp
+        socket/qlocalsocket_win.cpp
+)
+
+extend_target(Network CONDITION QT_FEATURE_system_proxies
+    DEFINES
+        QT_USE_SYSTEM_PROXIES
+)
+
+extend_target(Network CONDITION NOT QT_FEATURE_openssl
+    SOURCES
+        ssl/qsslcertificate_qt.cpp
+)
+
+extend_target(Network CONDITION QT_FEATURE_ssl
+    SOURCES
+        ssl/qocspresponse.cpp ssl/qocspresponse.h ssl/qocspresponse_p.h
+        ssl/qsslcipher.cpp ssl/qsslcipher.h ssl/qsslcipher_p.h
+        ssl/qsslconfiguration.cpp ssl/qsslconfiguration.h ssl/qsslconfiguration_p.h
+        ssl/qssldiffiehellmanparameters.cpp ssl/qssldiffiehellmanparameters.h ssl/qssldiffiehellmanparameters_p.h
+        ssl/qsslellipticcurve.cpp ssl/qsslellipticcurve.h
+        ssl/qsslerror.cpp ssl/qsslerror.h
+        ssl/qsslkey.h ssl/qsslkey_p.cpp ssl/qsslkey_p.h
+        ssl/qsslpresharedkeyauthenticator.cpp ssl/qsslpresharedkeyauthenticator.h ssl/qsslpresharedkeyauthenticator_p.h
+        ssl/qsslsocket.cpp ssl/qsslsocket.h ssl/qsslsocket_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_ssl AND WINRT
+    SOURCES
+        ssl/qsslcertificate_winrt.cpp
+        ssl/qssldiffiehellmanparameters_dummy.cpp
+        ssl/qsslellipticcurve_dummy.cpp
+        ssl/qsslkey_qt.cpp
+        ssl/qsslkey_winrt.cpp
+        ssl/qsslsocket_winrt.cpp ssl/qsslsocket_winrt_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qsslcertificate_schannel.cpp
+        ssl/qssldiffiehellmanparameters_dummy.cpp
+        ssl/qsslellipticcurve_dummy.cpp
+        ssl/qsslkey_qt.cpp
+        ssl/qsslkey_schannel.cpp
+        ssl/qsslsocket_qt.cpp
+        ssl/qsslsocket_schannel.cpp ssl/qsslsocket_schannel_p.h
+    LIBRARIES
+        Crypt32
+        Secur32
+        bcrypt
+        ncrypt
+)
+
+extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qssldiffiehellmanparameters_dummy.cpp
+        ssl/qsslellipticcurve_dummy.cpp
+        ssl/qsslkey_mac.cpp
+        ssl/qsslkey_qt.cpp
+        ssl/qsslsocket_mac.cpp ssl/qsslsocket_mac_p.h
+        ssl/qsslsocket_mac_shared.cpp
+        ssl/qsslsocket_qt.cpp
+)
+
+extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qdtls.cpp ssl/qdtls.h ssl/qdtls_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qsslcertificate_openssl.cpp
+        ssl/qsslcontext_openssl.cpp ssl/qsslcontext_openssl_p.h
+        ssl/qssldiffiehellmanparameters_openssl.cpp
+        ssl/qsslellipticcurve_openssl.cpp
+        ssl/qsslkey_openssl.cpp
+        ssl/qsslsocket_openssl.cpp ssl/qsslsocket_openssl_p.h
+        ssl/qsslsocket_openssl_symbols.cpp ssl/qsslsocket_openssl_symbols_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_openssl AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qdtls_openssl.cpp ssl/qdtls_openssl_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_ocsp AND QT_FEATURE_openssl AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qocsp_p.h
+)
+
+extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_opensslv11 AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qsslcontext_openssl11.cpp
+        ssl/qsslsocket_openssl11.cpp
+        ssl/qsslsocket_openssl11_symbols_p.h
+    DEFINES
+        OPENSSL_API_COMPAT=0x10100000L
+)
+
+extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_opensslv11
+    SOURCES
+        ssl/qsslcontext_opensslpre11.cpp
+        ssl/qsslsocket_opensslpre11.cpp
+        ssl/qsslsocket_opensslpre11_symbols_p.h
+)
+
+extend_target(Network CONDITION APPLE AND QT_FEATURE_openssl AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qsslsocket_mac_shared.cpp
+)
+
+extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT ANDROID_EMBEDDED
+    SOURCES
+        ssl/qsslsocket_openssl_android.cpp
+)
+
+extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl
+    LIBRARIES
+        OpenSSL::SSL
+)
+
+extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked
+    LIBRARIES
+        OpenSSL::SSL_nolink
+)
+
+extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32
+    SOURCES
+        ssl/qwindowscarootfetcher.cpp ssl/qwindowscarootfetcher_p.h
+    LIBRARIES
+        crypt32
+)
+
+extend_target(Network CONDITION WIN32 LIBRARIES ws2_32) # special case: mkspecs/common/msvc-desktop.conf
+
+add_qt_docs(
+    doc/qtnetwork.qdocconf
+)
diff --git a/src/network/configure.cmake b/src/network/configure.cmake
new file mode 100644
index 0000000000..c7d300acb0
--- /dev/null
+++ b/src/network/configure.cmake
@@ -0,0 +1,354 @@
+
+
+#### Inputs
+
+
+
+#### Libraries
+
+qt_find_package(Libproxy PROVIDED_TARGETS PkgConfig::Libproxy)
+qt_find_package(OpenSSL PROVIDED_TARGETS OpenSSL::SSL)
+qt_find_package(OpenSSL PROVIDED_TARGETS OpenSSL::SSL)
+
+
+#### Tests
+
+# getifaddrs
+qt_config_compile_test(getifaddrs
+    LABEL "getifaddrs()"
+"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <ifaddrs.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+ifaddrs *list;
+getifaddrs(&list);
+freeifaddrs(list);
+    /* END TEST: */
+    return 0;
+}
+"# FIXME: use: network
+)
+
+# ipv6ifname
+qt_config_compile_test(ipv6ifname
+    LABEL "IPv6 ifname"
+"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+char buf[IFNAMSIZ];
+if_nametoindex(\"eth0\");
+if_indextoname(1, buf);
+if_freenameindex(if_nameindex());
+    /* END TEST: */
+    return 0;
+}
+"# FIXME: use: network
+)
+
+# linux-netlink
+qt_config_compile_test(linux_netlink
+    LABEL "Linux AF_NETLINK sockets"
+"
+#include <asm/types.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+#include <sys/socket.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+struct rtattr rta = { };
+struct ifinfomsg ifi = {};
+struct ifaddrmsg ifa = {};
+struct ifa_cacheinfo ci;
+ci.ifa_prefered = ci.ifa_valid = 0;
+(void)RTM_NEWLINK; (void)RTM_NEWADDR;
+(void)IFLA_ADDRESS; (void)IFLA_IFNAME;
+(void)IFA_ADDRESS; (void)IFA_LABEL; (void)IFA_CACHEINFO;
+(void)(IFA_F_SECONDARY | IFA_F_DEPRECATED | IFA_F_PERMANENT | IFA_F_MANAGETEMPADDR);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# sctp
+qt_config_compile_test(sctp
+    LABEL "SCTP support"
+"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/sctp.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+sctp_initmsg sctpInitMsg;
+socklen_t sctpInitMsgSize = sizeof(sctpInitMsg);
+(void) socket(PF_INET, SOCK_STREAM, IPPROTO_SCTP);
+(void) getsockopt(-1, SOL_SCTP, SCTP_INITMSG, &sctpInitMsg, &sctpInitMsgSize);
+    /* END TEST: */
+    return 0;
+}
+"# FIXME: use: network
+)
+
+# openssl11
+qt_config_compile_test(openssl11
+    LABEL "OpenSSL 1.1 support"
+"
+#include <openssl/opensslv.h>
+#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L
+#  error OpenSSL >= 1.1 is required
+#endif
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+
+    /* END TEST: */
+    return 0;
+}
+"# FIXME: use: openssl
+)
+
+# dtls
+qt_config_compile_test(dtls
+    LABEL "DTLS support in OpenSSL"
+"
+#include <openssl/ssl.h>
+#if defined(OPENSSL_NO_DTLS) || !defined(DTLS1_2_VERSION)
+#  error OpenSSL without DTLS support
+#endif
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+
+    /* END TEST: */
+    return 0;
+}
+"# FIXME: use: openssl
+)
+
+# ocsp
+qt_config_compile_test(ocsp
+    LABEL "OCSP stapling support in OpenSSL"
+"
+#include <openssl/ssl.h>
+#include <openssl/ocsp.h>
+#if defined(OPENSSL_NO_OCSP) || defined(OPENSSL_NO_TLSEXT)
+#  error OpenSSL without OCSP stapling
+#endif
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+
+    /* END TEST: */
+    return 0;
+}
+"# FIXME: use: openssl
+)
+
+# gssapi
+qt_config_compile_test(gssapi
+    LABEL "KRB5 GSSAPI support"
+"
+#include <gssapi/gssapi.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+gss_ctx_id_t ctx;
+    /* END TEST: */
+    return 0;
+}
+"# FIXME: qmake: LIBS += -lgssapi_krb5
+)
+
+
+
+#### Features
+
+qt_feature("corewlan" PUBLIC PRIVATE
+    LABEL "CoreWLan"
+    CONDITION libs.corewlan OR FIXME
+    EMIT_IF APPLE
+)
+qt_feature_definition("corewlan" "QT_NO_COREWLAN" NEGATE VALUE "1")
+qt_feature("getifaddrs" PUBLIC
+    LABEL "getifaddrs()"
+    CONDITION TEST_getifaddrs
+)
+qt_feature_definition("getifaddrs" "QT_NO_GETIFADDRS" NEGATE VALUE "1")
+qt_feature("ipv6ifname" PUBLIC
+    LABEL "IPv6 ifname"
+    CONDITION TEST_ipv6ifname
+)
+qt_feature_definition("ipv6ifname" "QT_NO_IPV6IFNAME" NEGATE VALUE "1")
+qt_feature("libproxy" PRIVATE
+    LABEL "libproxy"
+    AUTODETECT OFF
+    CONDITION Libproxy_FOUND
+)
+qt_feature("linux_netlink" PRIVATE
+    LABEL "Linux AF_NETLINK"
+    CONDITION LINUX AND TEST_linux_netlink
+)
+qt_feature("openssl" PRIVATE
+    LABEL "OpenSSL"
+    CONDITION QT_FEATURE_openssl_runtime OR QT_FEATURE_openssl_linked
+    ENABLE false
+)
+qt_feature_definition("openssl" "QT_NO_OPENSSL" NEGATE)
+qt_feature("openssl_runtime"
+    AUTODETECT NOT WINRT AND NOT WASM
+    CONDITION NOT QT_FEATURE_securetransport AND NOT QT_FEATURE_schannel AND OPENSSL_INCLUDE_DIR
+    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 OpenSSL_FOUND
+    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' )
+    DISABLE INPUT_securetransport STREQUAL 'no' OR INPUT_ssl STREQUAL 'no'
+)
+qt_feature_definition("securetransport" "QT_SECURETRANSPORT")
+qt_feature("schannel" PUBLIC
+    LABEL "Schannel"
+    CONDITION INPUT_schannel STREQUAL 'yes' AND WIN32 AND NOT WINRT AND ( INPUT_openssl STREQUAL '' OR INPUT_openssl STREQUAL 'no' )
+    DISABLE INPUT_schannel STREQUAL 'no' OR INPUT_ssl STREQUAL 'no'
+)
+qt_feature_definition("schannel" "QT_SCHANNEL")
+qt_feature("ssl" PUBLIC
+    LABEL "SSL"
+    CONDITION WINRT OR QT_FEATURE_securetransport OR QT_FEATURE_openssl OR QT_FEATURE_schannel
+)
+qt_feature_definition("ssl" "QT_NO_SSL" NEGATE VALUE "1")
+qt_feature("dtls" PUBLIC
+    SECTION "Networking"
+    LABEL "DTLS"
+    PURPOSE "Provides a DTLS implementation"
+    CONDITION QT_FEATURE_openssl AND QT_FEATURE_udpsocket AND TEST_dtls
+)
+qt_feature("ocsp" PUBLIC
+    SECTION "Networking"
+    LABEL "OCSP-stapling"
+    PURPOSE "Provides OCSP stapling support"
+    CONDITION QT_FEATURE_opensslv11 AND TEST_ocsp
+)
+qt_feature("opensslv11" PUBLIC
+    LABEL "OpenSSL 1.1"
+    CONDITION QT_FEATURE_openssl AND ( OPENSSL_VERSION VERSION_GREATER_EQUAL "1.1.0" )
+)
+qt_feature("sctp" PUBLIC
+    LABEL "SCTP"
+    AUTODETECT OFF
+    CONDITION TEST_sctp
+)
+qt_feature_definition("sctp" "QT_NO_SCTP" NEGATE VALUE "1")
+qt_feature("system_proxies" PRIVATE
+    LABEL "Use system proxies"
+)
+qt_feature("ftp" PUBLIC
+    SECTION "Networking"
+    LABEL "FTP"
+    PURPOSE "Provides support for the File Transfer Protocol in QNetworkAccessManager."
+    CONDITION QT_FEATURE_textdate
+)
+qt_feature_definition("ftp" "QT_NO_FTP" NEGATE VALUE "1")
+qt_feature("http" PUBLIC
+    SECTION "Networking"
+    LABEL "HTTP"
+    PURPOSE "Provides support for the Hypertext Transfer Protocol in QNetworkAccessManager."
+    CONDITION QT_FEATURE_thread
+)
+qt_feature_definition("http" "QT_NO_HTTP" NEGATE VALUE "1")
+qt_feature("udpsocket" PUBLIC
+    SECTION "Networking"
+    LABEL "QUdpSocket"
+    PURPOSE "Provides access to UDP sockets."
+)
+qt_feature_definition("udpsocket" "QT_NO_UDPSOCKET" NEGATE VALUE "1")
+qt_feature("networkproxy" PUBLIC
+    SECTION "Networking"
+    LABEL "QNetworkProxy"
+    PURPOSE "Provides network proxy support."
+)
+qt_feature_definition("networkproxy" "QT_NO_NETWORKPROXY" NEGATE VALUE "1")
+qt_feature("socks5" PUBLIC
+    SECTION "Networking"
+    LABEL "SOCKS5"
+    PURPOSE "Provides SOCKS5 support in QNetworkProxy."
+    CONDITION QT_FEATURE_networkproxy
+)
+qt_feature_definition("socks5" "QT_NO_SOCKS5" NEGATE VALUE "1")
+qt_feature("networkinterface" PUBLIC
+    SECTION "Networking"
+    LABEL "QNetworkInterface"
+    PURPOSE "Supports enumerating a host's IP addresses and network interfaces."
+    CONDITION NOT WASM
+)
+qt_feature_definition("networkinterface" "QT_NO_NETWORKINTERFACE" NEGATE VALUE "1")
+qt_feature("networkdiskcache" PUBLIC
+    SECTION "Networking"
+    LABEL "QNetworkDiskCache"
+    PURPOSE "Provides a disk cache for network resources."
+    CONDITION QT_FEATURE_temporaryfile
+)
+qt_feature_definition("networkdiskcache" "QT_NO_NETWORKDISKCACHE" NEGATE VALUE "1")
+qt_feature("bearermanagement" PUBLIC
+    SECTION "Networking"
+    LABEL "Bearer management"
+    PURPOSE "Provides bearer management for the network stack."
+    CONDITION QT_FEATURE_thread AND QT_FEATURE_library AND QT_FEATURE_networkinterface AND QT_FEATURE_properties
+)
+qt_feature_definition("bearermanagement" "QT_NO_BEARERMANAGEMENT" NEGATE VALUE "1")
+qt_feature("localserver" PUBLIC
+    SECTION "Networking"
+    LABEL "QLocalServer"
+    PURPOSE "Provides a local socket based server."
+    CONDITION QT_FEATURE_temporaryfile
+)
+qt_feature_definition("localserver" "QT_NO_LOCALSERVER" NEGATE VALUE "1")
+qt_feature("dnslookup" PUBLIC
+    SECTION "Networking"
+    LABEL "QDnsLookup"
+    PURPOSE "Provides API for DNS lookups."
+)
+qt_feature("gssapi" PUBLIC
+    SECTION "Networking"
+    LABEL "GSSAPI"
+    PURPOSE "Enable SPNEGO authentication through GSSAPI"
+    CONDITION NOT WIN32 AND TEST_gssapi
+)
+qt_feature_definition("gssapi" "QT_NO_GSSAPI" NEGATE VALUE "1")
+qt_feature("sspi" PUBLIC
+    SECTION "Networking"
+    LABEL "SSPI"
+    PURPOSE "Enable NTLM/SPNEGO authentication through SSPI"
+    CONDITION WIN32 AND NOT WINRT
+)
+qt_feature_definition("sspi" "QT_NO_SSPI" NEGATE VALUE "1")
diff --git a/src/network/configure.json b/src/network/configure.json
index 56805da7b2..7225a6251d 100644
--- a/src/network/configure.json
+++ b/src/network/configure.json
@@ -403,25 +403,13 @@
     "report": [
         {
             "type": "note",
-            "condition": "features.openssl-linked && libs.openssl.source != 0
-                          && input.openssl.prefix == '' && input.openssl.libs == '' && input.openssl.libs.debug == ''",
-            "message": "When linking against OpenSSL, you can override the default
-library names through OPENSSL_LIBS.
-For example:
-    OPENSSL_LIBS='-L/opt/ssl/lib -lssl -lcrypto' ./configure -openssl-linked"
+            "condition": "features.openssl-linked && libs.openssl.source != 0 && input.openssl.prefix == '' && input.openssl.libs == '' && input.openssl.libs.debug == ''",
+            "message": "When linking against OpenSSL, you can override the default library names through OPENSSL_LIBS.  For example: OPENSSL_LIBS='-L/opt/ssl/lib -lssl -lcrypto' ./configure -openssl-linked"
         },
         {
             "type": "warning",
             "condition": "features.libproxy && input.qt_namespace == ''",
-            "message": "Some of libproxy's plugins may use incompatible Qt versions.
-
-    Some platforms and distributions ship libproxy with plugins, such
-    as config_kde4.so, that are linked against old versions of Qt; and
-    libproxy loads these plugins automatically when initialized. If Qt
-    is not in a namespace, that loading causes a crash. Even if the
-    systems on which you build and test have no such plugins, your
-    users' systems may have them. We therefore recommend that you
-    combine -libproxy with -qtnamespace when configuring Qt."
+            "message": "Some of libproxy's plugins may use incompatible Qt versions.  Some platforms and distributions ship libproxy with plugins, such as config_kde4.so, that are linked against old versions of Qt; and libproxy loads these plugins automatically when initialized. If Qt is not in a namespace, that loading causes a crash. Even if the systems on which you build and test have no such plugins, your users' systems may have them. We therefore recommend that you combine -libproxy with -qtnamespace when configuring Qt."
         }
     ],
 
diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp
index 6cae29193d..6be1e9443e 100644
--- a/src/network/socket/qhttpsocketengine.cpp
+++ b/src/network/socket/qhttpsocketengine.cpp
@@ -866,3 +866,5 @@ QAbstractSocketEngine *QHttpSocketEngineHandler::createSocketEngine(qintptr, QOb
 QT_END_NAMESPACE
 
 #endif // !QT_NO_NETWORKPROXY
+
+#include "moc_qhttpsocketengine_p.cpp"
diff --git a/src/network/socket/qnativesocketengine.cpp b/src/network/socket/qnativesocketengine.cpp
index 5126a5330f..7085fe3bbd 100644
--- a/src/network/socket/qnativesocketengine.cpp
+++ b/src/network/socket/qnativesocketengine.cpp
@@ -1382,3 +1382,5 @@ void QNativeSocketEngine::setExceptionNotificationEnabled(bool enable)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qnativesocketengine_p.cpp"
diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp
index 23aec12390..27657956df 100644
--- a/src/network/socket/qsocks5socketengine.cpp
+++ b/src/network/socket/qsocks5socketengine.cpp
@@ -1920,3 +1920,5 @@ QAbstractSocketEngine *QSocks5SocketEngineHandler::createSocketEngine(qintptr so
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qsocks5socketengine_p.cpp"