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:
  doc: Added more DITA output to the XML generator
  Usefully convert from QtScript object/array to QVariant
  document QSslSocket::systemCaCertificates() change in changelog
  Implement QIODevice::peek() using read() + ungetBlock().
  Allocate the memory for QtFontSize when count > 1
  doc: Added more DITA output to the XML generator
  Defer allocation of GIF decoding tables/stack.
  Make sure only started gestures can cause cancellations
  Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-16062010 ( 8b2d3443afca194f8ac50a63151dc9d19a150582 )
  qmake: Fix CONFIG += exceptions_off with the MSVC project generator.
  Fix some kind of race condition while using remote commands.
  Work around ICE in Intel C++ Compiler 11.1.072
  Reduce the memory consumption of QtFontStyle

1 files changed, 2 insertions, 1 deletions

diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index 6c5623e..ca3b56f 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -6277,7 +6277,8 @@ void QGraphicsScenePrivate::cancelGesturesForChildren(QGesture *original)
 {
     Q_ASSERT(original);
     QGraphicsItem *originalItem = gestureTargets.value(original);
-    Q_ASSERT(originalItem);
+    if (originalItem == 0) // we only act on accepted gestures, which implies it has a target.
+        return;
 
     // iterate over all active gestures and for each find the owner
     // if the owner is part of our sub-hierarchy, cancel it.