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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (51 commits)
  Symbian on Linux:  $QTDIR/bin is not necessarily in the path.
  Updated Symbian def files with new EGL exports.
  Added another missing EGL stub.
  Fixed compilation on Symbian.
  Added missing EGL stub function.
  Got rid of unused variable compiler warning.
  QGLWindowSurface support for partial updates via EGL_NOK_swap_region2
  Adding func prototypes for EGL_NOK_swap_region2 extension.
  Check for EGLSurface leak only when paint device is a QGLWidget.
  Fixed bug in drawTiledPixmap when width of pixmap matches target rect.
  Update def files for symbian
  Improved performance of 16 bit memrotates using NEON instructions.
  Use built-in iconv on Solaris if available
  Export various symbols needed to make a custom GL graphicssystem.
  Moc: fix compilation when templated types with multiple arguments are used.
  Fixes the documentation of QGraphicsEffect::update().
  support BGRA textures on SGX
  Avoid calling time.elapsed() twice in abstract animation
  Adds slowdownFactor to UnifiedTimer in abstract animation
  Add the conversion in-place for QPixmap::fromImageReader() on raster.
  ...

1 files changed, 2 insertions, 0 deletions

diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index e5264da..4bc7f4c 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -1335,6 +1335,8 @@ void QGraphicsScenePrivate::mousePressEventHandler(QGraphicsSceneMouseEvent *mou
                 break;
             }
         }
+        if (item->d_ptr->flags & QGraphicsItem::ItemStopsClickFocusPropagation)
+            break;
         if (item->isPanel())
             break;
     }