diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-10 01:00:41 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-10 10:39:33 +0200 |
commit | 6fd20defb95f0f3a7d1162641bd4ae9e0ed91bcc (patch) | |
tree | 2d8c70bc359810f926374ffebd649576345a9c7f /src/corelib | |
parent | d72ea9cbd3c2bde4645745c5aeba7cc052d87f0d (diff) | |
parent | 4bb975717b0ba2c7b41e1a44192c2d54c919cfee (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/time/qdatetime.cpp
src/widgets/widgets/qcombobox.h
Change-Id: Ib84352e8fe34aed2986a1c94e7346a46a71c803b
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/io/qurlquery.cpp | 2 | ||||
-rw-r--r-- | src/corelib/time/qdatetime.cpp | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/corelib/io/qurlquery.cpp b/src/corelib/io/qurlquery.cpp index e6aec9bf45..8d80a2d8bd 100644 --- a/src/corelib/io/qurlquery.cpp +++ b/src/corelib/io/qurlquery.cpp @@ -146,7 +146,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn QUrlQuery(std::initializer_list<QPair<QString, QString>> list) + \fn QUrlQuery::QUrlQuery(std::initializer_list<QPair<QString, QString>> list) \since 5.13 diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp index 31206f779d..aa8aa6b915 100644 --- a/src/corelib/time/qdatetime.cpp +++ b/src/corelib/time/qdatetime.cpp @@ -3272,10 +3272,9 @@ 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 |