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: (39 commits)
  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.
  Add QPixmap::fromImageReader() to decode arbitrary images in place.
  Add missing license header.
  Added textureUpload benchmark to the GL benchmarks
  Fixed a crash in menubar with invisible actions
  Fixed ARM .def files.
  Doc: QSettings::sync() imports changes made by other processes.
  Made -graphicssystem trace work with Qt::TextBypassShaping flag.
  Fix an assertion in comp_func_SourceOver_sse2() if const_alpha == 0
  Add a manual test for regular widget interaction with the table.
  New variant of ::createPixmapData with origin for QGraphicsSystem.
  EGL plane levels are the same as all other GL backends.
  Need to access extensionFuncs in subclasses too.
  ...

1 files changed, 8 insertions, 0 deletions

diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 2de3638..61285d2 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -411,6 +411,11 @@
     these notifications are disabled by default. You must enable this flag
     to receive notifications for scene position changes. This flag was
     introduced in Qt 4.6.
+
+    \omitvalue ItemStopsClickFocusPropagation \omit The item stops propagating
+    click focus to items underneath when being clicked on. This flag
+    allows you create a non-focusable item that can be clicked on without
+    changing the focus. \endomit
 */
 
 /*!
@@ -11432,6 +11437,9 @@ QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemFlag flag)
     case QGraphicsItem::ItemSendsScenePositionChanges:
         str = "ItemSendsScenePositionChanges";
         break;
+    case QGraphicsItem::ItemStopsClickFocusPropagation:
+        str = "ItemStopsClickFocusPropagation";
+        break;
     }
     debug << str;
     return debug;