diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-18 09:01:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-18 09:01:51 +0100 |
| commit | c7934f2489e2eb9a539206bab35f335b1943c5bd (patch) | |
| tree | a27d0ed6c001fe9432e2a0f28fb935acf9e4c65f /src/corelib/tools/qelapsedtimer.cpp | |
| parent | f40593b11199fbef886bfcb6b210a214d8c3adf3 (diff) | |
| parent | 08f9a1bd6ab9b1777ee5ba163d75e5c848c39eb4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/corelib/io/qprocess.cpp
src/corelib/io/qprocess_unix.cpp
src/network/kernel/qnetworkinterface_winrt.cpp
tools/configure/configureapp.cpp
Change-Id: I47df00a01597d2e63b334b492b3b4221b29f58ea
Diffstat (limited to 'src/corelib/tools/qelapsedtimer.cpp')
| -rw-r--r-- | src/corelib/tools/qelapsedtimer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qelapsedtimer.cpp b/src/corelib/tools/qelapsedtimer.cpp index 41e8b4854d..8360f11632 100644 --- a/src/corelib/tools/qelapsedtimer.cpp +++ b/src/corelib/tools/qelapsedtimer.cpp @@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE platforms that support it (see QElapsedTimer::isMonotonic()). This has the added benefit that QElapsedTimer is immune to time adjustments, such as the user correcting the time. Also unlike QTime, QElapsedTimer is - immune to changes in the timezone settings, such as daylight saving + immune to changes in the timezone settings, such as daylight-saving periods. On the other hand, this means QElapsedTimer values can only be compared |