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.

1 files changed, 0 insertions, 57 deletions

diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index 269ec24..7c1b97e 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -438,7 +438,6 @@ private slots:
     void QTBUG_6738_missingUpdateWithSetParent();
     void QTBUG_7714_fullUpdateDiscardingOpacityUpdate2();
     void QT_2653_fullUpdateDiscardingOpacityUpdate();
-    void QT_2649_focusScope();
 
 private:
     QList<QGraphicsItem *> paintedItems;
@@ -10003,61 +10002,5 @@ void tst_QGraphicsItem::QTBUG_7714_fullUpdateDiscardingOpacityUpdate2()
     QTRY_COMPARE(view.repaints, 1);
 }
 
-void tst_QGraphicsItem::QT_2649_focusScope()
-{
-    QGraphicsScene *scene = new QGraphicsScene;
-
-    QGraphicsRectItem *subFocusItem = new QGraphicsRectItem;
-    subFocusItem->setFlags(QGraphicsItem::ItemIsFocusable);
-    subFocusItem->setFocus();
-    QCOMPARE(subFocusItem->focusItem(), (QGraphicsItem *)subFocusItem);
-
-    QGraphicsRectItem *scope = new QGraphicsRectItem;
-    scope->setFlags(QGraphicsItem::ItemIsFocusable | QGraphicsItem::ItemIsFocusScope);
-    scope->setFocus();
-    subFocusItem->setParentItem(scope);
-    QCOMPARE(subFocusItem->focusItem(), (QGraphicsItem *)subFocusItem);
-    QCOMPARE(subFocusItem->focusScopeItem(), (QGraphicsItem *)0);
-    QCOMPARE(scope->focusItem(), (QGraphicsItem *)subFocusItem);
-    QCOMPARE(scope->focusScopeItem(), (QGraphicsItem *)subFocusItem);
-
-    QGraphicsRectItem *rootItem = new QGraphicsRectItem;
-    rootItem->setFlags(QGraphicsItem::ItemIsFocusable);
-    scope->setParentItem(rootItem);
-    QCOMPARE(rootItem->focusItem(), (QGraphicsItem *)subFocusItem);
-    QCOMPARE(rootItem->focusScopeItem(), (QGraphicsItem *)0);
-    QCOMPARE(subFocusItem->focusItem(), (QGraphicsItem *)subFocusItem);
-    QCOMPARE(subFocusItem->focusScopeItem(), (QGraphicsItem *)0);
-    QCOMPARE(scope->focusItem(), (QGraphicsItem *)subFocusItem);
-    QCOMPARE(scope->focusScopeItem(), (QGraphicsItem *)subFocusItem);
-
-    scene->addItem(rootItem);
-
-    QEvent windowActivate(QEvent::WindowActivate);
-    qApp->sendEvent(scene, &windowActivate);
-    scene->setFocus();
-
-    QCOMPARE(rootItem->focusItem(), (QGraphicsItem *)subFocusItem);
-    QCOMPARE(scope->focusItem(), (QGraphicsItem *)subFocusItem);
-    QCOMPARE(subFocusItem->focusItem(), (QGraphicsItem *)subFocusItem);
-    QCOMPARE(rootItem->focusScopeItem(), (QGraphicsItem *)0);
-    QCOMPARE(scope->focusScopeItem(), (QGraphicsItem *)subFocusItem);
-    QCOMPARE(subFocusItem->focusScopeItem(), (QGraphicsItem *)0);
-    QVERIFY(subFocusItem->hasFocus());
-
-    //If we hide the focusScope, the entire subFocus chain should be cleared
-    scope->hide();
-
-    QCOMPARE(rootItem->focusItem(), (QGraphicsItem *)0);
-    QCOMPARE(scope->focusItem(), (QGraphicsItem *)0);
-    QCOMPARE(subFocusItem->focusItem(), (QGraphicsItem *)0);
-    QCOMPARE(rootItem->focusScopeItem(), (QGraphicsItem *)0);
-    QCOMPARE(scope->focusScopeItem(), (QGraphicsItem *)subFocusItem);
-    QCOMPARE(subFocusItem->focusScopeItem(), (QGraphicsItem *)0);
-    QVERIFY(!subFocusItem->hasFocus());
-
-    delete scene;
-}
-
 QTEST_MAIN(tst_QGraphicsItem)
 #include "tst_qgraphicsitem.moc"