diff options
| author | Alan Alpert <aalpert@blackberry.com> | 2013-11-04 13:29:12 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-05 19:00:03 +0100 |
| commit | 41f447272f9c7e1c632770bb952f2515494edce0 (patch) | |
| tree | 0915f52a290bea67dd45c90bb69c41f15f80fc08 /src/quick/items/qquickmousearea.cpp | |
| parent | 025365f1dc6dc9c3244a125882433e55b57fa672 (diff) | |
Don't propagate mouse events to disabled MouseAreas
Task-number: QTBUG-34368
Change-Id: I28d4f57e51300f12a7bab5d215933762102f3916
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/quick/items/qquickmousearea.cpp')
| -rw-r--r-- | src/quick/items/qquickmousearea.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp index b9e6efaa10..ca64ebb6e3 100644 --- a/src/quick/items/qquickmousearea.cpp +++ b/src/quick/items/qquickmousearea.cpp @@ -156,7 +156,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i } QQuickMouseArea* ma = qobject_cast<QQuickMouseArea*>(item); - if (ma && ma != q && itemPrivate->acceptedMouseButtons() & ev->button()) { + if (ma && ma != q && ma->isEnabled() && itemPrivate->acceptedMouseButtons() & ev->button()) { switch (sig) { case Click: if (!ma->d_func()->isClickConnected()) |