From c8e00e4f7333ada3cd47282efc3c47eee32e7160 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 30 Jan 2020 10:15:46 +0100 Subject: Use char16_t in favor of ushort for locale data tables Change-Id: I890dd2b52c1b786db1081744c8ca343baba93de4 Reviewed-by: Qt CI Bot Reviewed-by: Lars Knoll --- src/corelib/time/qcalendarbackend_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/time/qcalendarbackend_p.h') diff --git a/src/corelib/time/qcalendarbackend_p.h b/src/corelib/time/qcalendarbackend_p.h index 24dd08873d..ea837a4804 100644 --- a/src/corelib/time/qcalendarbackend_p.h +++ b/src/corelib/time/qcalendarbackend_p.h @@ -137,7 +137,7 @@ protected: // Locale support: virtual const QCalendarLocale *localeMonthIndexData() const = 0; - virtual const ushort *localeMonthData() const = 0; + virtual const char16_t *localeMonthData() const = 0; bool registerAlias(const QString &name); -- cgit v1.2.3