diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-08 06:52:22 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-04-08 06:52:22 +0000 |
commit | 4cee9928f25926581c5bfcffeb648d89e0b232ec (patch) | |
tree | e4b3d5109b177a607c2275ed4729ea0a23e0d45c /src/plugins/platforms/windows/qwindowscontext.cpp | |
parent | 0d4232f53100eb04f8aa85ea2a7aee395baf337f (diff) | |
parent | 20cac3d9c9c22153e9e316daff32b6050ff6be6b (diff) |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforms/windows/qwindowscontext.cpp')
-rw-r--r-- | src/plugins/platforms/windows/qwindowscontext.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp index 7264fdcbb6..7d7ea031a5 100644 --- a/src/plugins/platforms/windows/qwindowscontext.cpp +++ b/src/plugins/platforms/windows/qwindowscontext.cpp @@ -1037,6 +1037,12 @@ bool QWindowsContext::windowsProc(HWND hwnd, UINT message, return true; } #endif + case QtWindows::ScrollEvent: +#if !defined(Q_OS_WINCE) && !defined(QT_NO_SESSIONMANAGER) + return platformSessionManager()->isInteractionBlocked() ? true : d->m_mouseHandler.translateScrollEvent(platformWindow->window(), hwnd, msg, result); +#else + return d->m_mouseHandler.translateScrollEvent(platformWindow->window(), hwnd, msg, result); +#endif case QtWindows::MouseWheelEvent: case QtWindows::MouseEvent: case QtWindows::LeaveEvent: |