diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-05-14 18:43:38 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-14 18:43:38 +0200 |
commit | 70cd276db01de8a9ccabb60282f00068b3840b88 (patch) | |
tree | ffeae752c77d0e0074b59fe5c3c682d2842e459e /src/plugins/platforms/windows | |
parent | 800214f0b9cbbbc7b77a12180ce59033dd3cca64 (diff) | |
parent | 3d4aeb791990f359e277efbfb0a1f1793945b55d (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforms/windows')
-rw-r--r-- | src/plugins/platforms/windows/qwindowsmousehandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowsmousehandler.cpp b/src/plugins/platforms/windows/qwindowsmousehandler.cpp index dfa400285a..5c9add4baa 100644 --- a/src/plugins/platforms/windows/qwindowsmousehandler.cpp +++ b/src/plugins/platforms/windows/qwindowsmousehandler.cpp @@ -364,7 +364,7 @@ bool QWindowsMouseHandler::translateMouseWheelEvent(QWindow *window, HWND, delta = (int) msg.wParam; Qt::Orientation orientation = (msg.message == WM_MOUSEHWHEEL - || (buttons & Qt::AltModifier)) ? + || (mods & Qt::AltModifier)) ? Qt::Horizontal : Qt::Vertical; // according to the MSDN documentation on WM_MOUSEHWHEEL: |