aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/items/qsgflickable.cpp
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2011-07-29 09:29:04 +1000
committerQt by Nokia <qt-info@nokia.com>2011-07-29 04:08:13 +0200
commit44f82f2078897270622581e1c3f385d12c3aba42 (patch)
tree6ed42ab4fb990a8722dd35bf92dd45ec99a429c7 /src/declarative/items/qsgflickable.cpp
parent2b9cccc859edb271f84728350d1a7666bbba111f (diff)
Clicking on a disabled ListView's delegate breaks mouse interaction
A disabled Flickable should not filter children. Change-Id: I9f0d8fbfd0922b5c6a9eaffa69212867359f79e0 Fixes: QTBUG-20584 Reviewed-on: http://codereview.qt.nokia.com/2354 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'src/declarative/items/qsgflickable.cpp')
-rw-r--r--src/declarative/items/qsgflickable.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/items/qsgflickable.cpp b/src/declarative/items/qsgflickable.cpp
index 2c04ab09c6..be6e97f363 100644
--- a/src/declarative/items/qsgflickable.cpp
+++ b/src/declarative/items/qsgflickable.cpp
@@ -1346,7 +1346,7 @@ bool QSGFlickable::sendMouseEvent(QGraphicsSceneMouseEvent *event)
bool QSGFlickable::childMouseEventFilter(QSGItem *i, QEvent *e)
{
Q_D(QSGFlickable);
- if (!isVisible() || !d->interactive)
+ if (!isVisible() || !d->interactive || !isEnabled())
return QSGItem::childMouseEventFilter(i, e);
switch (e->type()) {
case QEvent::GraphicsSceneMousePress: