1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update description of topleveldomain feature

Browse Source 
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 <marten.nordheim@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit 56d72d36bf7df8f9c87177e364096f0120876810)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Peter Varga 2023-01-16 13:12:49 +01:00 committed by Qt Cherry-pick Bot
parent eb5a495fa5
commit 761d22bb07
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/configure.cmake
View File

@ -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

4
src/network/kernel/qtldurl.cpp
View File

@ -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)

3
src/network/kernel/qtldurl_p.h
View File

@ -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