diff options
author | MÃ¥rten Nordheim <marten.nordheim@qt.io> | 2024-01-25 15:27:39 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-01-29 21:11:49 +0000 |
commit | 0624fb868f04be920286ed6de1c8549b8eeafd68 (patch) | |
tree | 92383f73179ca966b94e24c1cdaa192a59e7a419 /util | |
parent | 3d2d8c32c2675b03febe25fb09a592b630284969 (diff) |
Update public suffix list
Version 883ced078a83f9d79a98933145425c221a5e51f0, fetched on
2024-01-25.
[ChangeLog][Third-Party Code] Updated the public suffix list to upstream
SHA 883ced078a83f9d79a98933145425c221a5e51f0.
Pick-to: 6.5 6.2 5.15
Task-number: QTBUG-121325
Change-Id: I95e82b5c351218c1641e11e7a166ae21be2c5ad6
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit a17c10a63b3a86c71ebe6df54e56c9bce3ed5f18)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 036e9811d28b61f1a67a51b7157623adbe6d4eba)
Diffstat (limited to 'util')
-rwxr-xr-x | util/update_public_suffix_list.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/update_public_suffix_list.sh b/util/update_public_suffix_list.sh index 83517be879..6c13b46e53 100755 --- a/util/update_public_suffix_list.sh +++ b/util/update_public_suffix_list.sh @@ -2,7 +2,7 @@ # Copyright (C) 2023 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -PICK_TO_BRANCHES="6.6 6.5 6.2 5.15" +PICK_TO_BRANCHES="6.7 6.6 6.5 6.2 5.15" #UPSTREAM=github.com:publicsuffix/list.git # use this if you have a github account UPSTREAM=https://github.com/publicsuffix/list.git # and this if you don't |