diff options
| author | Soroush Rabiei <soroush@ametisco.ir> | 2017-01-14 20:23:31 +0330 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-08-20 13:41:21 +0200 |
| commit | aa8393c94fea01a4806b204fd3aa343a4e90666b (patch) | |
| tree | 071cf0bd8934b094d4e0208a25c11f439acb8173 /qmake/Makefile.win32 | |
| parent | 8f083bade0ba33d4be8a2d3ed1b5ce005aab6d8d (diff) | |
| download | qtbase-aa8393c94fea01a4806b204fd3aa343a4e90666b.tar.gz | |
Add support for calendars beside Gregorian
Add QCalendarBackend as a base class for calendar implementations and
QCalendar as a facade via which to access it.
QDate's implicit implementation of the Gregorian calendar becomes
QGregorianCalendar and QDate methods now support choice of calendar.
Convert QLocale's CLDR data for month names to a locale-data component
of each supported calendar and relevant QLocale methods now support
choice of calendar. Adapt Python scripts for locale data generation to
extract month name data from CLDR (keeping on version v35.1) into the
new calendar-locale files. The locale data for the Gregorian calendar
is held in a Roman calendar base, for sharing with other calendars.
Add tests for basic uses of the new API.
[ChangeLog][QtCore][QCalendar] Added QCalendar to support diverse
calendars, supported by implementing QCalendarBackend.
[ChangeLog][QtCore][QDate] Allow choice of calendar in various
operations, with Gregorian remaining the default.
Done-with: Lars Knoll <lars.knoll@qt.io>
Done-with: Edward Welbourne <edward.welbourne@qt.io>
Fixes: QTBUG-17110
Fixes: QTBUG-950
Change-Id: I9d6278f394269a183aee8156e990cec4d5198ab8
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'qmake/Makefile.win32')
| -rw-r--r-- | qmake/Makefile.win32 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 43059f9af0..672df47953 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -71,6 +71,7 @@ QTOBJS= \ qbytearray.obj \ qvsnprintf.obj \ qbytearraymatcher.obj \ + qcalendar.obj \ qdatetime.obj \ qdir.obj \ qdiriterator.obj \ @@ -83,6 +84,7 @@ QTOBJS= \ qfileinfo.obj \ qendian.obj \ qglobal.obj \ + qgregoriancalendar.obj \ qhash.obj \ qiodevice.obj \ qringbuffer.obj \ @@ -97,6 +99,7 @@ QTOBJS= \ qoperatingsystemversion.obj \ qoperatingsystemversion_win.obj \ qregexp.obj \ + qromancalendar.obj \ qutfcodec.obj \ qstring.obj \ qstringlist.obj \ |