diff options
| author | Pasi Pentikainen <ext-pasi.a.pentikainen@nokia.com> | 2012-05-04 14:47:55 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-08 00:39:44 (GMT) |
| commit | 0f73af96c8ac823761f6ad4f364ce346688e4621 (patch) | |
| tree | 3d3c34648ec1cf2d877253f9ed245903e41476e4 /src/declarative | |
| parent | b889b3c8e83a56526eae04289ab9b1608d268b2a (diff) | |
| download | Qt-0f73af96c8ac823761f6ad4f364ce346688e4621.zip Qt-0f73af96c8ac823761f6ad4f364ce346688e4621.tar.gz Qt-0f73af96c8ac823761f6ad4f364ce346688e4621.tar.bz2 | |
Clicking on a disabled ListView's delegate breaks mouse interaction
A disabled Flickable should not filter children.
This is a backport of change I9f0d8fbfd0922b5c6a9eaffa69212867359f79e0,
from Qt5 (later discarded in QtQuick1 restructuring of Qt5).
Task-number: QTBUG-20584
Change-Id: Id279907ee90faf19284c12b548467850662a7019
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp index 229d04b..8b07054 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -1582,7 +1582,7 @@ bool QDeclarativeFlickable::sendMouseEvent(QGraphicsSceneMouseEvent *event) bool QDeclarativeFlickable::sceneEventFilter(QGraphicsItem *i, QEvent *e) { Q_D(QDeclarativeFlickable); - if (!isVisible() || !d->interactive) + if (!isVisible() || !d->interactive || !isEnabled()) return QDeclarativeItem::sceneEventFilter(i, e); switch (e->type()) { case QEvent::GraphicsSceneMousePress: |