diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-08-20 10:34:13 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-20 13:05:12 (GMT) |
| commit | f18b03d543f66981e455b013df75fb0bcd2611cb (patch) | |
| tree | c386066c2ea5b21ad6277cc51a8603b8160605af /src/corelib | |
| parent | 871c2fbc5192836cc2918a760aec4d4c680fd8c0 (diff) | |
| download | Qt-f18b03d543f66981e455b013df75fb0bcd2611cb.zip Qt-f18b03d543f66981e455b013df75fb0bcd2611cb.tar.gz Qt-f18b03d543f66981e455b013df75fb0bcd2611cb.tar.bz2 | |
Revert "Disable precision timers when running MSVC2012 code on pre-Windows 8."
This reverts commit aea654b84713b8085ee0a291e3325b1ca53080aa.
Follow-up commit will fix the issue.
Task-number: QTBUG-18852
Task-number: QTBUG-27266
Change-Id: Iadbae6b94de6e47e0b9bf428f57b63ffa286e382
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_win.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp index 6e85890..c05f90c 100644 --- a/src/corelib/kernel/qeventdispatcher_win.cpp +++ b/src/corelib/kernel/qeventdispatcher_win.cpp @@ -326,11 +326,7 @@ static void resolveTimerAPI() #else QSystemLibrary library(QLatin1String("winmm")); #endif - if ( -#if defined(_MSC_VER) && _MSC_VER >= 1700 // QTBUG-27266, Disable when running MSVC2012-built code on pre-Windows - QSysInfo::WindowsVersion >= QSysInfo::WV_WINDOWS8 && -#endif - library.load()) { + if (library.load()) { qtimeSetEvent = (ptimeSetEvent)library.resolve("timeSetEvent"); qtimeKillEvent = (ptimeKillEvent)library.resolve("timeKillEvent"); } |