diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-18 01:00:07 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-18 01:00:08 +0100 |
| commit | 3e9f8b5249282324c615941af97f1ebf8a85991f (patch) | |
| tree | f1a4b0a92abe0f0f238516f03b5d216e7912b643 /src/corelib/time | |
| parent | 800dda19a611339863aa5cfe6da13bc235d68e68 (diff) | |
| parent | 9c172af7d5d8696a692fb2e040be11eae99a4b0c (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I12148e7b20bcdb72d9b328035d528c99633b1e92
Diffstat (limited to 'src/corelib/time')
| -rw-r--r-- | src/corelib/time/qcalendar.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/time/qtimezone.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/time/qcalendar.cpp b/src/corelib/time/qcalendar.cpp index 6a4623ce92..9d485f181e 100644 --- a/src/corelib/time/qcalendar.cpp +++ b/src/corelib/time/qcalendar.cpp @@ -723,7 +723,7 @@ QCalendar::QCalendar(QLatin1String name) QCalendar::QCalendar(QStringView name) : d(QCalendarBackend::fromName(name)) {} -/* +/*! \fn bool QCalendar::isValid() const Returns true if this is a valid calendar object. diff --git a/src/corelib/time/qtimezone.cpp b/src/corelib/time/qtimezone.cpp index 3d2078087b..87d8ea75f1 100644 --- a/src/corelib/time/qtimezone.cpp +++ b/src/corelib/time/qtimezone.cpp @@ -217,7 +217,7 @@ Q_GLOBAL_STATIC(QTimeZoneSingleton, global_tz); This class includes data obtained from the CLDR data files under the terms of the Unicode Data Files and Software License. See - \l{Unicode Common Locale Data Repository (CLDR)} for details. + \l{unicode-cldr}{Unicode Common Locale Data Repository (CLDR)} for details. \sa QDateTime */ |