diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-01-30 10:15:46 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-02-17 14:55:42 +0100 |
| commit | c8e00e4f7333ada3cd47282efc3c47eee32e7160 (patch) | |
| tree | dcf28a5aca563c5e8853838b885d6a9cdb27f3b8 /src/corelib/time/qromancalendar_p.h | |
| parent | ed2b110b6add650954dc102a0317c14ff826c677 (diff) | |
Use char16_t in favor of ushort for locale data tables
Change-Id: I890dd2b52c1b786db1081744c8ca343baba93de4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/time/qromancalendar_p.h')
| -rw-r--r-- | src/corelib/time/qromancalendar_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/time/qromancalendar_p.h b/src/corelib/time/qromancalendar_p.h index 49efb3df89..4ba699ffa6 100644 --- a/src/corelib/time/qromancalendar_p.h +++ b/src/corelib/time/qromancalendar_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -68,7 +68,7 @@ public: protected: // locale support: const QCalendarLocale *localeMonthIndexData() const override; - const ushort *localeMonthData() const override; + const char16_t *localeMonthData() const override; // (The INTEGRITY compiler got upset at: using QCalendarBackend:QCalendarBackend;) QRomanCalendar(const QString &name, QCalendar::System id = QCalendar::System::User) : QCalendarBackend(name, id) {} |