From 4f076db3d2e2e27cc56029fe878056ee79def56f Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Wed, 12 Feb 2020 14:09:29 +0100 Subject: Remove QUrl::topLevelDomain MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And move the actual implementation from corelib/io to network/kernel sub-module. Fixes: QTBUG-80308 Change-Id: I554b05bae3552c68e1e1a405c169366ee19120b2 Reviewed-by: Mårten Nordheim Reviewed-by: Qt CI Bot --- src/network/.prev_CMakeLists.txt | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'src/network/.prev_CMakeLists.txt') diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt index 107ef7178f..afe28a2da0 100644 --- a/src/network/.prev_CMakeLists.txt +++ b/src/network/.prev_CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### 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 @@ -25,14 +24,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 @@ -92,6 +83,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 @@ -144,6 +147,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 -- cgit v1.2.3