path: root/src/widgets
diff options
authorGabriel de Dietrich <>2016-03-08 14:37:55 -0800
committerGabriel de Dietrich <>2016-03-21 04:51:39 +0000
commit96740193e1e0f0608f67660811a44b696924ad4c (patch)
treeafbe0240723d9d5b8d27fe8f2866e91132efe57e /src/widgets
parent0fed37e2cfed18518afb607d4d7e4f243910a55c (diff)
QWheelEvent: Make NoScrollPhase public
This reverts d5fde514106f5479f9c929c8a165aced4a1b2c84 and makes that enum value the default for QWheelEvent::phase() with non phase-aware mice. [ChangeLog][QtGui] QWheelEvent::phase() returns NoScrollPhase with non phase-aware mice. This is most mice and input devices except, for now, Apple's trackpads and Magic Mouse. Change-Id: I929fb39889cf116e89dcd134c1b1ec6587b8f05e Reviewed-by: Shawn Rutledge <>
Diffstat (limited to 'src/widgets')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 5d934fe8ec..2e68c7888f 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -3370,7 +3370,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
// A new scrolling sequence or partial sequence starts and w has accepted
// the event. Therefore, we can set wheel_widget, but only if it's not
// the end of a sequence.
- if (spontaneous && (phase == Qt::ScrollBegin || phase == Qt::ScrollUpdate) && QGuiApplicationPrivate::scrollNoPhaseAllowed)
+ if (spontaneous && (phase == Qt::ScrollBegin || phase == Qt::ScrollUpdate))
QApplicationPrivate::wheel_widget = w;