diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-28 10:32:56 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-28 10:32:56 +0100 |
commit | 96ffe48add521e29d883814a35b1130b9dfdd636 (patch) | |
tree | d0ae779efa69ecb8c39999786af22152db902806 /src/corelib/tools/qtimezone.cpp | |
parent | 37217c57fa5595e7cdfd7e19f34de22848dfc370 (diff) | |
parent | eba652a99f602386127e552740fddf5445b3d7c9 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I1ce43c8a214a869c5c4ac4245bb92c88c6bc6999
Diffstat (limited to 'src/corelib/tools/qtimezone.cpp')
-rw-r--r-- | src/corelib/tools/qtimezone.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qtimezone.cpp b/src/corelib/tools/qtimezone.cpp index 29299bfcd6..445ddeb31d 100644 --- a/src/corelib/tools/qtimezone.cpp +++ b/src/corelib/tools/qtimezone.cpp @@ -137,7 +137,7 @@ Q_GLOBAL_STATIC(QTimeZoneSingleton, global_tz); \note For consistency with QDateTime, QTimeZone does not account for leap seconds. - \section1 + \section1 Remarks \section2 IANA Time Zone IDs |