Fix order of QSGItem mouse filtering.

QGraphicsView filtered child items beginning with the item's
parent, grandparent, greatgrandparent... QSGCanvas did the
opposite, which breaks the QML mouse handling element filtering logic.

Task-number: QTBUG-21446
Change-Id: I18e125305eef536237195895a7f41f88b532d4aa
Reviewed-on: http://codereview.qt-project.org/5819
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/declarative/items/qsgcanvas.cpp b/src/declarative/items/qsgcanvas.cpp
index 2ced204804..d4a74cdda8 100644
--- a/src/declarative/items/qsgcanvas.cpp
+++ b/src/declarative/items/qsgcanvas.cpp
@@ -1439,14 +1439,14 @@ bool QSGCanvasPrivate::sendFilteredMouseEvent(QSGItem *target, QSGItem *item, QM
     if (!target)
         return false;
 
-    if (sendFilteredMouseEvent(target->parentItem(), item, event))
-        return true;
-
     QSGItemPrivate *targetPrivate = QSGItemPrivate::get(target);
     if (targetPrivate->filtersChildMouseEvents)
         if (target->childMouseEventFilter(item, event))
             return true;
 
+    if (sendFilteredMouseEvent(target->parentItem(), item, event))
+        return true;
+
     return false;
 }