blob: 9fdb6092bd1b1862fea5b01d9e49e9fd9810e9b8 (
plain)
1 From 75f0f4eb1e4f2823c39fe27137f78ac2c10bc293 Mon Sep 17 00:00:00 2001
2 From: Kirill Burtsev <kirill.burtsev@qt.io>
3 Date: Thu, 31 Mar 2022 19:45:39 +0200
4 Subject: [FIXUP] Fix compilation with system ICU
5
6 As of chromium 92.0.4480.0 after a set of fixes ending with a
7 https://chromium-review.googlesource.com/c/chromium/src/+/2830820
8 the need to override UCHAR_TYPE was dropped with the result that
9 codebase is ready for default 'char16_t'. Override was already dropped
10 for 98-based, which already builds fine for system ICU 70.1
11
12 Task-number: QTBUG-100495
13 Change-Id: I0e6d422f77b77015840647b52247f51736dd8a41
14 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
15 ---
16 chromium/third_party/icu/BUILD.gn | 6 ------
17 1 file changed, 6 deletions(-)
18
19 diff --git a/chromium/third_party/icu/BUILD.gn b/chromium/third_party/icu/BUILD.gn
20 index d5b136168ef..269de02eaaa 100644
21 --- a/chromium/third_party/icu/BUILD.gn
22 +++ b/chromium/third_party/icu/BUILD.gn
23 @@ -410,12 +410,6 @@ config("system_icu_config") {
24 "USING_SYSTEM_ICU=1",
25 "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC",
26 ]
27 -
28 - if (is_win) {
29 - defines += [ "UCHAR_TYPE=wchar_t" ]
30 - } else {
31 - defines += [ "UCHAR_TYPE=uint16_t" ]
32 - }
33 }
34
35 if (use_system_icu) {
36 --
37 cgit v1.2.1
|
