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:
  Build fix for Sun Studio
  Finish to resolve merge conflict.
  Fixes QMenu to only have static POD members
  QScript: Test against QMetaType::QVariant instead of against the string
  Fixes tst_QScriptExtQObject::connectAndDisconnect
  Fix source compatibility of qRegisterMetaType
  Fix warnings on MSVC
  Updating documentation for how to build QWS with tslib
  sizeHint of checkbox/radiobutton without text is not correct
  Some cleanup of outdated src/3rdparty stuff
  Revert "Fixes crash when destroying a QGraphicsItem."
  Add config.test for multimedia/qml
  Fix QVariant autotest
  Fix compilation of Q_DECLARE_METATYPE(QVariant) by introducing QMetaType::QVariant
  fixed a memory leak when restoring a state in QMainWindow
  Make the sub-menu accessible via its shortcut even if it is the current
  remove a warning on windows and simplify a bit the code
  Add and use QGLContextPrivate::eglSurfaceForDevice()
  QMetaType: Now we can register typedefs.

2 files changed, 4 insertions, 3 deletions

diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 5735cd6..4f06f80 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -3179,9 +3179,8 @@ void QGraphicsItemPrivate::setFocusHelper(Qt::FocusReason focusReason, bool clim
 */
 void QGraphicsItem::clearFocus()
 {
-    // Pass focus to the closest parent focus scope when clearing focus
-    // from a focus scope.
-    if (!d_ptr->inDestructor && (d_ptr->flags & ItemIsFocusScope)) {
+    // Pass focus to the closest parent focus scope.
+    if (!d_ptr->inDestructor) {
         QGraphicsItem *p = d_ptr->parent;
         while (p) {
             if (p->flags() & ItemIsFocusScope) {
diff --git a/src/gui/graphicsview/qgraphicslinearlayout.cpp b/src/gui/graphicsview/qgraphicslinearlayout.cpp
index 6a9eb29..9722683 100644
--- a/src/gui/graphicsview/qgraphicslinearlayout.cpp
+++ b/src/gui/graphicsview/qgraphicslinearlayout.cpp
@@ -554,6 +554,8 @@ void QGraphicsLinearLayout::dump(int indent) const
                d->orientation == Qt::Horizontal ? "Horizontal" : "Vertical");
         d->engine.dump(indent + 1);
     }
+#else
+    Q_UNUSED(indent);
 #endif
 }