Remove QUrl::topLevelDomain

And move the actual implementation from corelib/io to network/kernel
sub-module.

Fixes: QTBUG-80308
Change-Id: I554b05bae3552c68e1e1a405c169366ee19120b2
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

1 files changed, 18 insertions, 9 deletions

diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index 7bd04d5c9f..ca30771eb0 100644
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -18,7 +18,6 @@ endif()
 #####################################################################
 
 qt_add_module(Network
-    PLUGIN_TYPES bearer
     SOURCES
         access/qabstractnetworkcache.cpp access/qabstractnetworkcache.h access/qabstractnetworkcache_p.h
         access/qhsts.cpp access/qhsts_p.h
@@ -38,14 +37,6 @@ qt_add_module(Network
         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/qbearerengine_impl_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/qnetworksession_impl.cpp bearer/qnetworksession_impl_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
@@ -105,6 +96,18 @@ if(ANDROID AND (QT_FEATURE_bearermanagement))
     )
 endif()
 
+qt_extend_target(Network CONDITION QT_FEATURE_bearermanagement
+    SOURCES
+        bearer/qbearerengine.cpp bearer/qbearerengine_p.h
+        bearer/qbearerengine_impl_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/qnetworksession_impl.cpp bearer/qnetworksession_impl_p.h
+        bearer/qsharednetworksession.cpp bearer/qsharednetworksession_p.h
+)
+
 qt_extend_target(Network CONDITION QT_FEATURE_ftp
     SOURCES
         access/qftp.cpp access/qftp_p.h
@@ -157,6 +160,12 @@ qt_extend_target(Network CONDITION QT_FEATURE_http
         socket/qhttpsocketengine.cpp socket/qhttpsocketengine_p.h
 )
 
+qt_extend_target(Network CONDITION QT_FEATURE_topleveldomain
+    SOURCES
+        kernel/qtldurl.cpp kernel/qtldurl_p.h
+        kernel/qurltlds_p.h
+)
+
 qt_extend_target(Network CONDITION QT_FEATURE_dnslookup
     SOURCES
         kernel/qdnslookup.cpp kernel/qdnslookup.h kernel/qdnslookup_p.h