diff options
| -rw-r--r-- | src/network/kernel/qt_attribution.json (renamed from src/corelib/io/qt_attribution.json) | 2 | ||||
| -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 | ||||
| -rw-r--r-- | util/publicSuffix/main.cpp (renamed from util/corelib/qurl-generateTLDs/main.cpp) | 0 | ||||
| -rw-r--r-- | util/publicSuffix/publicSuffix.pro (renamed from util/corelib/qurl-generateTLDs/qurl-generateTLDs.pro) | 0 |
6 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/io/qt_attribution.json b/src/network/kernel/qt_attribution.json index 397d7668a4..f5a21f9404 100644 --- a/src/corelib/io/qt_attribution.json +++ b/src/network/kernel/qt_attribution.json @@ -14,7 +14,7 @@ It allows browsers to, for example: - Accurately sort history entries by site", "Files": "qurltlds_p.h", - "QtUsage": "See util/corelib/qurl-generateTLDs/ for code-generator", + "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).", 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++. diff --git a/util/corelib/qurl-generateTLDs/main.cpp b/util/publicSuffix/main.cpp index ba2bcdbebd..ba2bcdbebd 100644 --- a/util/corelib/qurl-generateTLDs/main.cpp +++ b/util/publicSuffix/main.cpp diff --git a/util/corelib/qurl-generateTLDs/qurl-generateTLDs.pro b/util/publicSuffix/publicSuffix.pro index 99723b7c0f..99723b7c0f 100644 --- a/util/corelib/qurl-generateTLDs/qurl-generateTLDs.pro +++ b/util/publicSuffix/publicSuffix.pro |