diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-04-10 17:33:14 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-04-10 17:33:14 +0000 |
| commit | 63e88f60a769f2535945db0e1cabb9815ff45a77 (patch) | |
| tree | cea2359bc9b5b4e3acce7aeca59a2f9b5d251bcb /src/corelib/kernel/qelapsedtimer_win.cpp | |
| parent | 0bdded64accc3f654b2d12d9bfaf64f842cedf26 (diff) | |
| parent | ff88e20b8328b6aad5b787aacc5c39da563a67b1 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into refs/staging/5.13
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 a63290d2f8..3beb158b8a 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() { |