diff options
| author | Oliver Wolff <oliver.wolff@digia.com> | 2013-09-16 14:16:24 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-20 13:54:06 +0200 |
| commit | 4260ed49c653487b85d6fa2d3e7e4c60b6e9e591 (patch) | |
| tree | e526ec43863fe3377ef2bc65d90be512f35c6f87 /src/corelib/tools/qelapsedtimer_win.cpp | |
| parent | 89f299201df9c44d118f3effcd2ea919c8159aec (diff) | |
WinRT: Compile fix for qelapsedtimer_win.cpp
Change-Id: I1c9d6904eecd499ca8c2b744e8ac60696f40c20f
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/corelib/tools/qelapsedtimer_win.cpp')
| -rw-r--r-- | src/corelib/tools/qelapsedtimer_win.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/tools/qelapsedtimer_win.cpp b/src/corelib/tools/qelapsedtimer_win.cpp index 25c63c42e2..a4e33e8201 100644 --- a/src/corelib/tools/qelapsedtimer_win.cpp +++ b/src/corelib/tools/qelapsedtimer_win.cpp @@ -114,6 +114,7 @@ static quint64 getTickCount() } } +#ifndef Q_OS_WINRT if (ptrGetTickCount64) return ptrGetTickCount64(); @@ -124,6 +125,10 @@ static quint64 getTickCount() ++highdword; lastval = val; return val | (quint64(highdword) << 32); +#else // !Q_OS_WINRT + // ptrGetTickCount64 is always set on WinRT but GetTickCount is not available + return ptrGetTickCount64(); +#endif // Q_OS_WINRT } int qt_msectime() |