diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:31:28 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-23 14:31:28 +0100 |
commit | 425b38ef95f6f4478ffbd4ada0d3046fae2c95e7 (patch) | |
tree | 0347dd701ace8ab022cf6c86edbb61be9795a668 /src/gui/kernel/qwindowsysteminterface_qpa.cpp | |
parent | 2f2b78321427daa8c7f0702140c297d22b0bf3c8 (diff) | |
parent | 3b512ae142017f105f297467f74dc28d3cb9030a (diff) |
Merge "Merge master into api_changes" into refs/staging/api_changes
Diffstat (limited to 'src/gui/kernel/qwindowsysteminterface_qpa.cpp')
-rw-r--r-- | src/gui/kernel/qwindowsysteminterface_qpa.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwindowsysteminterface_qpa.cpp b/src/gui/kernel/qwindowsysteminterface_qpa.cpp index fcffd75b39..bcbf96b2c0 100644 --- a/src/gui/kernel/qwindowsysteminterface_qpa.cpp +++ b/src/gui/kernel/qwindowsysteminterface_qpa.cpp @@ -226,7 +226,7 @@ void QWindowSystemInterface::handleWheelEvent(QWindow *w, const QPointF & local, void QWindowSystemInterface::handleWheelEvent(QWindow *tlw, ulong timestamp, const QPointF & local, const QPointF & global, int d, Qt::Orientation o, Qt::KeyboardModifiers mods) { QPoint point = (o == Qt::Vertical) ? QPoint(0, d) : QPoint(d, 0); - handleWheelEvent(tlw, timestamp, local, global, point, point, mods); + handleWheelEvent(tlw, timestamp, local, global, QPoint(), point, mods); } void QWindowSystemInterface::handleWheelEvent(QWindow *w, const QPointF & local, const QPointF & global, QPoint pixelDelta, QPoint angleDelta, Qt::KeyboardModifiers mods) |