diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2023-01-16 13:12:49 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2023-01-17 18:21:26 +0100 |
| commit | 56d72d36bf7df8f9c87177e364096f0120876810 (patch) | |
| tree | 095512210b316d7e7325660faff6ab048cd75e5f | |
| parent | ada434e417568457df252b6069ec51f6ba8335c8 (diff) | |
Update description of topleveldomain feature
qTopLevelDomain() is misleading in the configure summary. The function
has been removed by commit 50b3097683
Also clean up the topleveldomain files.
Pick-to: 6.5
Change-Id: Ib577962909a83f4f41d1660a26fd80b37803ae18
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
| -rw-r--r-- | src/network/configure.cmake | 5 | ||||
| -rw-r--r-- | src/network/kernel/qtldurl.cpp | 4 | ||||
| -rw-r--r-- | 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 6afa139058..aef7f150b9 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 7bda9845b9..a7aceddb18 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 f051fba4df..86b163f161 100644 --- a/src/network/kernel/qtldurl_p.h +++ b/src/network/kernel/qtldurl_p.h @@ -16,7 +16,6 @@ // #include <QtNetwork/private/qtnetworkglobal_p.h> -#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 |