summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/corelib/kernel/qeventdispatcher_win.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
index c05f90c..6e85890 100644
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@@ -326,7 +326,11 @@ static void resolveTimerAPI()
#else
QSystemLibrary library(QLatin1String("winmm"));
#endif
- if (library.load()) {
+ 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()) {
qtimeSetEvent = (ptimeSetEvent)library.resolve("timeSetEvent");
qtimeKillEvent = (ptimeKillEvent)library.resolve("timeKillEvent");
}