diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-04-11 07:47:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-04-11 07:47:21 +0200 |
| commit | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (patch) | |
| tree | 7ca5d4ba83888bb5ad4d9b0141e5c62f8a5138f2 /src/corelib/kernel/qelapsedtimer_win.cpp | |
| parent | 235ac95520a0fc2c822dedce7358e3c64a764255 (diff) | |
| parent | 63e88f60a769f2535945db0e1cabb9815ff45a77 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/widgets/styles/qstyle_p.h
Change-Id: I0e6e856bd6628da1135b3ba674dddffabbeb5c09
Diffstat (limited to 'src/corelib/kernel/qelapsedtimer_win.cpp')
| -rw-r--r-- | src/corelib/kernel/qelapsedtimer_win.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/corelib/kernel/qelapsedtimer_win.cpp b/src/corelib/kernel/qelapsedtimer_win.cpp index d8a50a8277..8becb17461 100644 --- a/src/corelib/kernel/qelapsedtimer_win.cpp +++ b/src/corelib/kernel/qelapsedtimer_win.cpp @@ -77,15 +77,6 @@ static inline qint64 ticksToNanoseconds(qint64 ticks) return ticks * 1000000; } -static inline qint64 nanosecondsToTicks(qint64 nsec) -{ - if (counterFrequency > 0) { - // QueryPerformanceCounter uses an arbitrary frequency - return double(nsec) * counterFrequency / 1000000000.; - } - // GetTickCount(64) uses milliseconds - return nsec / 1000000; -} static quint64 getTickCount() { |