From 1e7f1e5b73b931931178bc884d3469439adf8c5c Mon Sep 17 00:00:00 2001 From: Ievgenii Meshcheriakov Date: Wed, 24 Jan 2024 16:46:57 +0100 Subject: [PATCH] Update Unicode data version string MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This amends c4e550703c2bdc1ee710507b8df9c0c9a118402e. The data version update was just forgotten when updating to Unicode 15.0. Pick-to: 6.5 6.6 6.7 Change-Id: Ibb3e9cb81e9bbcb5d4aaf4e4df6231485531c128 Reviewed-by: Mårten Nordheim Reviewed-by: Edward Welbourne --- src/corelib/text/qunicodetables.cpp | 2 +- src/corelib/text/qunicodetables_p.h | 4 ++-- util/unicode/main.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/corelib/text/qunicodetables.cpp b/src/corelib/text/qunicodetables.cpp index e8ca5c18075..46ac6dfb4e2 100644 --- a/src/corelib/text/qunicodetables.cpp +++ b/src/corelib/text/qunicodetables.cpp @@ -1,7 +1,7 @@ // Copyright (C) 2020 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -/* This file is autogenerated from the Unicode 14.0 database. Do not edit */ +/* This file is autogenerated from the Unicode 15.0 database. Do not edit */ #include "qunicodetables_p.h" diff --git a/src/corelib/text/qunicodetables_p.h b/src/corelib/text/qunicodetables_p.h index 0cf18a98c10..46b31709735 100644 --- a/src/corelib/text/qunicodetables_p.h +++ b/src/corelib/text/qunicodetables_p.h @@ -1,7 +1,7 @@ // Copyright (C) 2020 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -/* This file is autogenerated from the Unicode 14.0 database. Do not edit */ +/* This file is autogenerated from the Unicode 15.0 database. Do not edit */ // // W A R N I N G @@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE -#define UNICODE_DATA_VERSION QChar::Unicode_14_0 +#define UNICODE_DATA_VERSION QChar::Unicode_15_0 namespace QUnicodeTables { diff --git a/util/unicode/main.cpp b/util/unicode/main.cpp index 25da7e4ea29..269ead2d816 100644 --- a/util/unicode/main.cpp +++ b/util/unicode/main.cpp @@ -14,8 +14,8 @@ #include #endif -#define DATA_VERSION_S "14.0" -#define DATA_VERSION_STR "QChar::Unicode_14_0" +#define DATA_VERSION_S "15.0" +#define DATA_VERSION_STR "QChar::Unicode_15_0" static QHash age_map;