diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-26 14:50:27 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-28 00:24:14 +0200 |
| commit | 3043c7b95e139426d07889bf8dd46f0552874297 (patch) | |
| tree | d24e406826ebbce4f40eca941aa28abb0b292dfa | |
| parent | 5220b40edd52ea70ed3a09f9a28fa7fe50ce71e6 (diff) | |
Fix qdoc warnings in 5.14
Fix warning:
src/corelib/global/qnamespace.qdoc:2371: (qdoc) warning: Cannot find 'Qt::SplitBehavior' specified with '\enum' in any header file
and qdoc getting confused by a link spanning lines:
src/corelib/time/qdatetime.cpp:3324: (qdoc) warning: Unknown macro 'note'
src/corelib/time/qdatetime.cpp:3326: (qdoc) warning: Unknown macro 'section1'
src/corelib/time/qdatetime.cpp:3328: (qdoc) warning: Unknown macro 'section2'
src/corelib/time/qdatetime.cpp:3334: (qdoc) warning: Unknown macro 'section2'
src/corelib/time/qdatetime.cpp:3344: (qdoc) warning: Unknown macro 'section2'
src/corelib/time/qdatetime.cpp:3361: (qdoc) warning: Unknown macro 'section2'
src/corelib/time/qdatetime.cpp:3373: (qdoc) warning: Unknown macro 'e'
src/corelib/time/qdatetime.cpp:3378: (qdoc) warning: Unknown macro 'section2'
src/corelib/time/qdatetime.cpp:3386: (qdoc) warning: Unknown macro 'sa'
Change-Id: I314da69078eb07f66e9d389eecdf0195569ea2ce
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 2 | ||||
| -rw-r--r-- | src/corelib/time/qdatetime.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 45d79902c7..0ff6be2049 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -2369,7 +2369,7 @@ */ /*! - \enum Qt::SplitBehavior + \enum Qt::SplitBehaviorFlags \since 5.14 This enum specifies how the split() functions should behave with diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp index e34ce71212..3c7484dca5 100644 --- a/src/corelib/time/qdatetime.cpp +++ b/src/corelib/time/qdatetime.cpp @@ -3272,9 +3272,10 @@ inline qint64 QDateTimePrivate::zoneMSecsToEpochMSecs(qint64 zoneMSecs, const QT provides functions for comparing datetimes and for manipulating a datetime by adding a number of seconds, days, months, or years. - QDateTime can describe datetimes with respect to \l{Qt::LocalTime}{local - time}, to \l{Qt::UTC}{UTC}, to a specified \l{Qt::OffsetFromUTC}{offset - from UTC} or to a specified \l{{Qt::TimeZone}{time zone}, in conjunction + QDateTime can describe datetimes with respect to + \l{Qt::LocalTime}{local time}, to \l{Qt::UTC}{UTC}, to a specified + \l{Qt::OffsetFromUTC}{offset from UTC} or to a specified + \l{Qt::TimeZone}{time zone}, in conjunction with the QTimeZone class. For example, a time zone of "Europe/Berlin" will apply the daylight-saving rules as used in Germany since 1970. In contrast, an offset from UTC of +3600 seconds is one hour ahead of UTC (usually |