Fabian Vogt
3f844ba466
Qt 5.14 Alpha OBS-URL: https://build.opensuse.org/request/show/734738 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qtwebengine?expand=0&rev=2
33 lines
1.0 KiB
Diff
33 lines
1.0 KiB
Diff
From 7bc2392c19118a80380c7661fb86c69022eb2b47 Mon Sep 17 00:00:00 2001
|
|
From: Kirill Burtsev <kirill.burtsev@qt.io>
|
|
Date: Fri, 23 Aug 2019 15:09:25 +0200
|
|
Subject: [PATCH] Fix compilation with system ICU
|
|
|
|
system_icu_config is missing default type for UCHAR_TYPE, that causes
|
|
a mismatch of types all over Chromium. uint16_t is defined as a base type
|
|
under linux in chromium/build/linux/unbundle/icu.gn.
|
|
Necessary constructions were lost during recent refactorings,
|
|
and seems to be restored in later chromium > 76.
|
|
|
|
Change-Id: Ie05c005ebcded9a228386db5d9abe9863787ec2b
|
|
---
|
|
|
|
diff --git a/src/3rdparty/chromium/third_party/icu/BUILD.gn b/src/3rdparty/chromium/third_party/icu/BUILD.gn
|
|
index be3c919..639f8fd 100644
|
|
--- a/src/3rdparty/chromium/third_party/icu/BUILD.gn
|
|
+++ b/src/3rdparty/chromium/third_party/icu/BUILD.gn
|
|
@@ -1175,6 +1175,12 @@
|
|
"USING_SYSTEM_ICU=1",
|
|
"ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC",
|
|
]
|
|
+
|
|
+ if (is_win) {
|
|
+ defines += [ "UCHAR_TYPE=wchar_t" ]
|
|
+ } else {
|
|
+ defines += [ "UCHAR_TYPE=uint16_t" ]
|
|
+ }
|
|
}
|
|
|
|
if (use_system_icu) {
|
|
|