diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-08-19 16:12:17 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-20 10:22:39 +0200 |
| commit | 882e01a94f83bc1625d68b279cdde9a38dae0166 (patch) | |
| tree | 23a211d2ef55d55c447d1d81c1d0574238032f6c /src | |
| parent | 1d0715fde129ba36b39bb8ab98355c74b9d78e6a (diff) | |
Revert "Disable precision timers when running MSVC2012 code on pre-Windows 8."
This reverts commit aa1b4c0943187d82e0c313b93559e99226a9c75a.
It turns out that the bug is caused by a different mask constant
in Windows 8 which should not take effect in pre-Windows 8.
Change-Id: I1ad502262dae42856c07d48ee3bc9dc032ab379b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_win.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp index d1bd8fbe95..ae291f13cd 100644 --- a/src/corelib/kernel/qeventdispatcher_win.cpp +++ b/src/corelib/kernel/qeventdispatcher_win.cpp @@ -52,8 +52,6 @@ #include "qelapsedtimer.h" #include "qcoreapplication_p.h" -#include "qsysinfo.h" - #include <private/qthread_p.h> #include <private/qmutexpool_p.h> @@ -307,14 +305,8 @@ static void resolveTimerAPI() #endif triedResolve = true; #if !defined(Q_OS_WINCE) -# if defined(_MSC_VER) && _MSC_VER >= 1700 - if (QSysInfo::WindowsVersion >= QSysInfo::WV_WINDOWS8) { // QTBUG-27266, Disable when running MSVC2012-built code on pre-Windows 8 -# else - { -# endif qtimeSetEvent = (ptimeSetEvent)QSystemLibrary::resolve(QLatin1String("winmm"), "timeSetEvent"); qtimeKillEvent = (ptimeKillEvent)QSystemLibrary::resolve(QLatin1String("winmm"), "timeKillEvent"); - } #else qtimeSetEvent = (ptimeSetEvent)QSystemLibrary::resolve(QLatin1String("Mmtimer"), "timeSetEvent"); qtimeKillEvent = (ptimeKillEvent)QSystemLibrary::resolve(QLatin1String("Mmtimer"), "timeKillEvent"); |