diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-16 07:58:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-16 07:58:32 +0200 |
| commit | 17198e03ab36e5f579a1477b09cc3e601975eb5f (patch) | |
| tree | 61ba826e9edd53469abdc1e1f58b1223d0336c56 /src/corelib/kernel/qelapsedtimer.cpp | |
| parent | a5e89005445ac8ca18ac046eaf55fe2230e47cd6 (diff) | |
| parent | 2e2b32a9ab459f6618d02e4b454c75a787172def (diff) | |
| download | qtbase-17198e03ab36e5f579a1477b09cc3e601975eb5f.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
qmake/doc/src/qmake-manual.qdoc
src/corelib/global/qglobal.cpp
src/corelib/tools/qstring.cpp
src/network/socket/qabstractsocket.cpp
src/network/socket/qnativesocketengine_unix.cpp
src/plugins/platforms/eglfs/api/qeglfsglobal.h
Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288
Diffstat (limited to 'src/corelib/kernel/qelapsedtimer.cpp')
| -rw-r--r-- | src/corelib/kernel/qelapsedtimer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qelapsedtimer.cpp b/src/corelib/kernel/qelapsedtimer.cpp index 4aa9f9bffa..5e9d1317ac 100644 --- a/src/corelib/kernel/qelapsedtimer.cpp +++ b/src/corelib/kernel/qelapsedtimer.cpp @@ -140,7 +140,7 @@ QT_BEGIN_NAMESPACE \value SystemTime The human-readable system time. This clock is not monotonic. \value MonotonicClock The system's monotonic clock, usually found in Unix systems. This clock is monotonic and does not overflow. \value TickCounter The system's tick counter, used on Windows systems. This clock may overflow. - \value MachAbsoluteTime The Mach kernel's absolute time (OS X and iOS). This clock is monotonic and does not overflow. + \value MachAbsoluteTime The Mach kernel's absolute time (\macos and iOS). This clock is monotonic and does not overflow. \value PerformanceCounter The high-resolution performance counter provided by Windows. This clock is monotonic and does not overflow. \section2 SystemTime @@ -182,8 +182,8 @@ QT_BEGIN_NAMESPACE \section2 MachAbsoluteTime This clock type is based on the absolute time presented by Mach kernels, - such as that found on OS X. This clock type is presented separately - from MonotonicClock since OS X and iOS are also Unix systems and may support + such as that found on \macos. This clock type is presented separately + from MonotonicClock since \macos and iOS are also Unix systems and may support a POSIX monotonic clock with values differing from the Mach absolute time. |