Skip to content

Commit

Permalink
Update Unicode data version string
Browse files Browse the repository at this point in the history
This amends c4e5507. The data version
update was just forgotten when updating to Unicode 15.0.

Pick-to: 6.5
Change-Id: Ibb3e9cb81e9bbcb5d4aaf4e4df6231485531c128
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 1e7f1e5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit e42e26d)
  • Loading branch information
eugmes authored and Qt Cherry-pick Bot committed Jan 31, 2024
1 parent 3465e2d commit 17bebcd
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/corelib/text/qunicodetables.cpp
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
4 changes: 2 additions & 2 deletions src/corelib/text/qunicodetables_p.h
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions util/unicode/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#include <private/qunicodetables_p.h>
#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<QByteArray, QChar::UnicodeVersion> age_map;
Expand Down

0 comments on commit 17bebcd

Please sign in to comment.