diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-04-07 08:42:48 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-06 01:05:29 (GMT) |
| commit | 2913f89cea4f9dd76988b854390526dd1fc35a99 (patch) | |
| tree | 224c409b2e7e3708ccc4bc372575a7f6e5e676f5 /src/corelib | |
| parent | 64a2bc8cebe36ed4e7ad430a23fc4bb536f790e1 (diff) | |
| download | Qt-2913f89cea4f9dd76988b854390526dd1fc35a99.zip Qt-2913f89cea4f9dd76988b854390526dd1fc35a99.tar.gz Qt-2913f89cea4f9dd76988b854390526dd1fc35a99.tar.bz2 | |
Use WINVER instead of _MSC_VER for version check in qeventdispatcher_win.cpp.
Task-number: QTBUG-38604
Change-Id: Idb8a8219e09c6aa1a1b24e45b9da640c8d4b7161
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
(cherry picked from qtbase/e30ae1268f8e224369ff7841b90184c8694a86e7)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_win.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp index c83d898..f4f9256 100644 --- a/src/corelib/kernel/qeventdispatcher_win.cpp +++ b/src/corelib/kernel/qeventdispatcher_win.cpp @@ -510,10 +510,10 @@ static inline UINT inputTimerMask() UINT result = QS_TIMER | QS_INPUT | QS_RAWINPUT; // QTBUG 28513, QTBUG-29097, QTBUG-29435: QS_TOUCH, QS_POINTER became part of // QS_INPUT in Windows Kit 8. They should not be used when running on pre-Windows 8. -#if defined(_MSC_VER) && _MSC_VER >= 1700 +#if WINVER > 0x0602 if (QSysInfo::WindowsVersion < QSysInfo::WV_WINDOWS8) result &= ~(QS_TOUCH | QS_POINTER); -#endif // _MSC_VER >= 1700 +#endif // WINVER > 0x0602 return result; } |