diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-31 08:24:21 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-31 08:24:21 +0200 |
commit | f510a51dace0cb39a93b057b8fcbcbdda33a956e (patch) | |
tree | cd1dac8a78ecbb7579c59bf9f0b0d2d6fba56b4a /src/corelib/tools/qdatetime.cpp | |
parent | ccedc853a67da078ace234af7b23fbf861736f3f (diff) | |
parent | 84830fc07d65d58fce9b24b5ec8f1224b0969ac0 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I843994939f126ced22f7fe978ec4403f599fc7c9
Diffstat (limited to 'src/corelib/tools/qdatetime.cpp')
-rw-r--r-- | src/corelib/tools/qdatetime.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index a2c92835fe..e4b28178e8 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -2997,9 +2997,8 @@ inline qint64 QDateTimePrivate::zoneMSecsToEpochMSecs(qint64 zoneMSecs, const QT QDateTime takes into account the system's time zone information when dealing with DST. On modern Unix systems, this means it applies the correct historical DST data whenever possible. On - Windows and Windows CE, where the system doesn't support - historical DST data, historical accuracy is not maintained with - respect to DST. + Windows, where the system doesn't support historical DST data, + historical accuracy is not maintained with respect to DST. The range of valid dates taking DST into account is 1970-01-01 to the present, and rules are in place for handling DST correctly |