From 15a0b9624d5ab1bcb85470a36835d3557a8f9aba Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 22 Jan 2025 12:12:25 +0100 Subject: [PATCH] util/update_public_suffix_list.sh: update the pick-to's MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drop 6.7 and add 6.9. Task-number: QTBUG-132851 Change-Id: I68d787578ce4070c030e30ea95d710a6e1298f19 Reviewed-by: MÃ¥rten Nordheim --- util/update_public_suffix_list.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/update_public_suffix_list.sh b/util/update_public_suffix_list.sh index ba00f1177f6..80d5f2d175b 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.8 6.7 6.5 6.2 5.15" +PICK_TO_BRANCHES="6.9 6.8 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