From 761d22bb07ceb024db466bc192e44f5498c4d4d3 Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Mon, 16 Jan 2023 13:12:49 +0100 Subject: [PATCH] Update description of topleveldomain feature MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qTopLevelDomain() is misleading in the configure summary. The function has been removed by commit 50b3097683 Also clean up the topleveldomain files. Change-Id: Ib577962909a83f4f41d1660a26fd80b37803ae18 Reviewed-by: Mårten Nordheim Reviewed-by: Marc Mutz (cherry picked from commit 56d72d36bf7df8f9c87177e364096f0120876810) Reviewed-by: Qt Cherry-pick Bot --- src/network/configure.cmake | 5 +++-- src/network/kernel/qtldurl.cpp | 4 +--- src/network/kernel/qtldurl_p.h | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/network/configure.cmake b/src/network/configure.cmake index 6afa139058f..aef7f150b9d 100644 --- a/src/network/configure.cmake +++ b/src/network/configure.cmake @@ -331,8 +331,9 @@ qt_feature("networklistmanager" PRIVATE ) qt_feature("topleveldomain" PUBLIC SECTION "Networking" - LABEL "qTopLevelDomain()" - PURPOSE "Provides support for extracting the top level domain from URLs. If enabled, a binary dump of the Public Suffix List (http://www.publicsuffix.org, Mozilla License) is included. The data is then also used in QNetworkCookieJar::validateCookie." + LABEL "qIsEffectiveTLD()" + PURPOSE "Provides support for checking if a domain is a top level domain. If enabled, a binary dump of the Public Suffix List (http://www.publicsuffix.org, Mozilla License) is included. The data is used in QNetworkCookieJar." + DISABLE INPUT_publicsuffix STREQUAL "no" ) qt_feature("publicsuffix-qt" PRIVATE diff --git a/src/network/kernel/qtldurl.cpp b/src/network/kernel/qtldurl.cpp index 7bda9845b95..a7aceddb185 100644 --- a/src/network/kernel/qtldurl.cpp +++ b/src/network/kernel/qtldurl.cpp @@ -7,9 +7,7 @@ #if QT_CONFIG(topleveldomain) -#include "qurl.h" #include "QtCore/qfile.h" -#include "QtCore/qfileinfo.h" #include "QtCore/qloggingcategory.h" #include "QtCore/qstandardpaths.h" #include "QtCore/qstring.h" @@ -214,4 +212,4 @@ Q_NETWORK_EXPORT bool qIsEffectiveTLD(QStringView domain) QT_END_NAMESPACE -#endif +#endif // QT_CONFIG(topleveldomain) diff --git a/src/network/kernel/qtldurl_p.h b/src/network/kernel/qtldurl_p.h index f051fba4dff..86b163f1612 100644 --- a/src/network/kernel/qtldurl_p.h +++ b/src/network/kernel/qtldurl_p.h @@ -16,7 +16,6 @@ // #include -#include "QtCore/qurl.h" #include "QtCore/qstring.h" QT_REQUIRE_CONFIG(topleveldomain); @@ -31,4 +30,4 @@ inline bool qIsEffectiveTLD(const QString &domain) QT_END_NAMESPACE -#endif // QDATAURL_P_H +#endif // QTLDURL_P_H