diff options
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qt_attribution.json | 29 | ||||
| -rw-r--r-- | src/network/kernel/qtldurl.cpp | 2 | ||||
| -rw-r--r-- | src/network/kernel/qurltlds_p.h | 2 | ||||
| -rw-r--r-- | src/network/kernel/qurltlds_p.h.INFO | 2 |
4 files changed, 32 insertions, 3 deletions
diff --git a/src/network/kernel/qt_attribution.json b/src/network/kernel/qt_attribution.json new file mode 100644 index 0000000000..f5a21f9404 --- /dev/null +++ b/src/network/kernel/qt_attribution.json @@ -0,0 +1,29 @@ +{ + "Id": "psl", + "Name": "The Public Suffix List", + "QDocModule": "qtcore", + "Description": "The Public Suffix List is an initiative of Mozilla, +but is maintained as a community resource. It is available for use in any software, +but was originally created to meet the needs of browser manufacturers. +It allows browsers to, for example: + +- Avoid privacy-damaging \"supercookies\" being set for high-level domain name suffixes + +- Highlight the most important part of a domain name in the user interface + +- Accurately sort history entries by site", + + "Files": "qurltlds_p.h", + "QtUsage": "See util/publicSuffix/ for code-generator", + "QtUsage": "Used in Qt Core to avoid setting \"supercookies\" in the cookie jar +supported by Qt (by the QNetworkCookieJar class).", + + "Homepage": "Consult https://github.com/publicsuffix/list for the sha1 but download from ...", + "Homepage": "http://publicsuffix.org/", + "Version": "b880425f09bca902da412bdece4f68e942f3a23b, fetched on 2020-03-13", + "License": "Mozilla Public License 2.0", + "LicenseFile": "PSL-LICENSE.txt", + "LicenseId": "MPL-2.0", + "Copyright": "The list was originally provided by Jo Hermans <jo.hermans@gmail.com>. +It is now maintained on github (https://github.com/publicsuffix/list)." +} diff --git a/src/network/kernel/qtldurl.cpp b/src/network/kernel/qtldurl.cpp index 7dc4e9cd47..55c893ed2d 100644 --- a/src/network/kernel/qtldurl.cpp +++ b/src/network/kernel/qtldurl.cpp @@ -59,7 +59,7 @@ enum TLDMatchType { }; // Scan the auto-generated table of TLDs for an entry. For more details -// see comments in file: util/corelib/qurl-generateTLDs/main.cpp +// see comments in file: util/publicSuffix/main.cpp static bool containsTLDEntry(QStringView entry, TLDMatchType match) { const QStringView matchSymbols[] = { diff --git a/src/network/kernel/qurltlds_p.h b/src/network/kernel/qurltlds_p.h index 3738e5bab5..acb3313588 100644 --- a/src/network/kernel/qurltlds_p.h +++ b/src/network/kernel/qurltlds_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE // note to maintainer: // this file should be updated before each release -> // for instructions see the program at -// util/corelib/qurl-generateTLDs/ +// util/publicSuffix/ static const quint16 tldCount = 8853; // After the tldCount "real" entries in tldIndices, include a final entry diff --git a/src/network/kernel/qurltlds_p.h.INFO b/src/network/kernel/qurltlds_p.h.INFO index 33ccd458bf..3f72ac9b04 100644 --- a/src/network/kernel/qurltlds_p.h.INFO +++ b/src/network/kernel/qurltlds_p.h.INFO @@ -1,6 +1,6 @@ The file qurltlds_p.h is generated from the Public Suffix List (see [1] and [2]), by the program residing at -util/corelib/qurl-generateTLDs in the Qt source tree. +qtbase/util/publicSuffix/ in the Qt source tree. That program generates a character array and an index array from the list to provide fast lookups of elements within C++. |