diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-08-10 15:19:27 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-15 10:02:36 +0200 |
| commit | 751989df5cc441dcffbbbe2da0c3c0558701d5c6 (patch) | |
| tree | faaed4ab993c54924da0be15ec7c090c0041ab18 /src/gui/kernel/qwindowsysteminterface_p.h | |
| parent | 8e13a9792afcaf1be901ac00418b30372e818fde (diff) | |
Replace QWheelEvent::Phase with revised Qt::ScrollPhase
Change-Id: I4d8e7d48497d0d96a297191976c0d99feb67b538
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/gui/kernel/qwindowsysteminterface_p.h')
| -rw-r--r-- | src/gui/kernel/qwindowsysteminterface_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qwindowsysteminterface_p.h b/src/gui/kernel/qwindowsysteminterface_p.h index 7dbc3ad8ed..46479701cc 100644 --- a/src/gui/kernel/qwindowsysteminterface_p.h +++ b/src/gui/kernel/qwindowsysteminterface_p.h @@ -218,7 +218,7 @@ public: class WheelEvent : public InputEvent { public: WheelEvent(QWindow *w, ulong time, const QPointF & local, const QPointF & global, QPoint pixelD, QPoint angleD, int qt4D, Qt::Orientation qt4O, - Qt::KeyboardModifiers mods, QWheelEvent::Phase phase = QWheelEvent::Changed) + Qt::KeyboardModifiers mods, Qt::ScrollPhase phase = Qt::ScrollUpdate) : InputEvent(w, time, Wheel, mods), pixelDelta(pixelD), angleDelta(angleD), qt4Delta(qt4D), qt4Orientation(qt4O), localPos(local), globalPos(global), phase(phase) { } QPoint pixelDelta; QPoint angleDelta; @@ -226,7 +226,7 @@ public: Qt::Orientation qt4Orientation; QPointF localPos; QPointF globalPos; - QWheelEvent::Phase phase; + Qt::ScrollPhase phase; }; class KeyEvent : public InputEvent { |