summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-07-15 02:17:10 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-07-15 02:17:10 (GMT)
commit34fc612144f204d130307dc9d64657340a9d7f7d (patch)
treebb32e8b03859273c72814deb6debcdc3566d32e3 /src/corelib
parent86c6b7ec20bd1b9f208685cb1daa20ee144c6edd (diff)
parentd4f7cc91cdaee88db35fd74666d631d44c8dd4b7 (diff)
downloadQt-34fc612144f204d130307dc9d64657340a9d7f7d.zip
Qt-34fc612144f204d130307dc9d64657340a9d7f7d.tar.gz
Qt-34fc612144f204d130307dc9d64657340a9d7f7d.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: namespace fix
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/tools/qelapsedtimer_win.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qelapsedtimer_win.cpp b/src/corelib/tools/qelapsedtimer_win.cpp
index cd076a6..d79dc5d 100644
--- a/src/corelib/tools/qelapsedtimer_win.cpp
+++ b/src/corelib/tools/qelapsedtimer_win.cpp
@@ -42,14 +42,14 @@
#include "qelapsedtimer.h"
#include <windows.h>
-// Result of QueryPerformanceFrequency, 0 indicates that the high resolution timer is unavailable
-static quint64 counterFrequency = 0;
-
typedef ULONGLONG (WINAPI *PtrGetTickCount64)(void);
static PtrGetTickCount64 ptrGetTickCount64 = 0;
QT_BEGIN_NAMESPACE
+// Result of QueryPerformanceFrequency, 0 indicates that the high resolution timer is unavailable
+static quint64 counterFrequency = 0;
+
static void resolveLibs()
{
static bool done = false;