summaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickmousearea.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-01-19 10:32:37 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2016-01-19 10:32:37 +0100
commit81b3d791b5920832eefb616720bccf5cd386cd57 (patch)
tree9c89f63c0977c5c7ae09d8a35b505dd09e88a64f /src/quick/items/qquickmousearea.cpp
parent7c9e51e7e7b358fb9c4829ee8f02918ec4cfd016 (diff)
parentd1461c8429c7b6f9e9442f319d5a49b7e7a5b67d (diff)
Merge remote-tracking branch 'origin/5.5' into 5.6
Diffstat (limited to 'src/quick/items/qquickmousearea.cpp')
-rw-r--r--src/quick/items/qquickmousearea.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
index b933dc240a..ef053abbd1 100644
--- a/src/quick/items/qquickmousearea.cpp
+++ b/src/quick/items/qquickmousearea.cpp
@@ -118,7 +118,7 @@ bool QQuickMouseAreaPrivate::isWheelConnected()
void QQuickMouseAreaPrivate::propagate(QQuickMouseEvent* event, PropagateType t)
{
Q_Q(QQuickMouseArea);
- if (!propagateComposedEvents)
+ if (!window || !propagateComposedEvents)
return;
QPointF scenePos = q->mapToScene(QPointF(event->x(), event->y()));
propagateHelper(event, window->contentItem(), scenePos, t);