Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fixed touch event delivery in QGraphicsView.
  let WebKit inject itself into the qt configuration
  add indirect input/output specification capability to QMAKE_SUBSTITUTES
  Add test that exercises lupdate warnings for QtScript
  Make qsTrId() / QT_TRID_NOOP() accessible from QtScript
  Make lupdate's QtScript frontend recognize qsTrId() / QT_TRID_NOOP()
  Add support for comments and meta-data in the lupdate QtScript frontend
  Streamline lupdate's QtScript frontend's error messaging
  Doc: linking up orphant files
  Doc: Updating menu links

1 files changed, 2 insertions, 7 deletions

diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index a98ce6f..a02f3ac 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -5740,16 +5740,11 @@ void QGraphicsScenePrivate::touchEventHandler(QTouchEvent *sceneTouchEvent)
             }
 
             if (sceneTouchEvent->deviceType() == QTouchEvent::TouchScreen) {
-                // on touch-screens, combine this touch point with the closest one we find if it
-                // is a a direct descendent or ancestor (
+                // on touch-screens, combine this touch point with the closest one we find
                 int closestTouchPointId = findClosestTouchPointId(touchPoint.scenePos());
                 QGraphicsItem *closestItem = itemForTouchPointId.value(closestTouchPointId);
-                if (!item
-                    || (closestItem
-                        && (item->isAncestorOf(closestItem)
-                            || closestItem->isAncestorOf(item)))) {
+                if (!item || (closestItem && cachedItemsUnderMouse.contains(closestItem)))
                     item = closestItem;
-                }
             }
             if (!item)
                 continue;