You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
27 lines
1.8 KiB
27 lines
1.8 KiB
diff -up qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/i18n/string_compare.cc.BOOL qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/i18n/string_compare.cc
|
|
--- qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/i18n/string_compare.cc.BOOL 2020-11-06 19:22:36.000000000 -0600
|
|
+++ qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/i18n/string_compare.cc 2021-06-24 12:00:52.393740774 -0500
|
|
@@ -18,8 +18,8 @@ UCollationResult CompareString16WithColl
|
|
StringPiece16 rhs) {
|
|
UErrorCode error = U_ZERO_ERROR;
|
|
UCollationResult result = collator.compare(
|
|
- icu::UnicodeString(FALSE, lhs.data(), static_cast<int>(lhs.length())),
|
|
- icu::UnicodeString(FALSE, rhs.data(), static_cast<int>(rhs.length())),
|
|
+ icu::UnicodeString(false, lhs.data(), static_cast<int>(lhs.length())),
|
|
+ icu::UnicodeString(false, rhs.data(), static_cast<int>(rhs.length())),
|
|
error);
|
|
DCHECK(U_SUCCESS(error));
|
|
return result;
|
|
diff -up qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/i18n/time_formatting.cc.BOOL qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/i18n/time_formatting.cc
|
|
--- qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/i18n/time_formatting.cc.BOOL 2020-11-06 19:22:36.000000000 -0600
|
|
+++ qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/base/i18n/time_formatting.cc 2021-06-24 12:01:13.735648901 -0500
|
|
@@ -236,7 +236,7 @@ bool TimeDurationFormatWithSeconds(const
|
|
icu::FieldPosition ignore(icu::FieldPosition::DONT_CARE);
|
|
measure_format.formatMeasures(measures, 3, formatted, ignore, status);
|
|
*out = i18n::UnicodeStringToString16(formatted);
|
|
- return U_SUCCESS(status) == TRUE;
|
|
+ return U_SUCCESS(status) == true;
|
|
}
|
|
|
|
string16 DateIntervalFormat(const Time& begin_time,
|