Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging: (114 commits)
  Fixed license header.
  Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile
  Remove Q_ASSERT's from qsharedmemory autotest
  Remove Q_ASSERT's from QNetworkReply autotest
  Remove Q_ASSERT's from qabstractxmlnodemodel test
  Remove Q_ASSERT from QXmlStream autotest
  Remove Q_ASSERT from qxmlquery autotest
  Remove Q_ASSERT's from QXmlStream autotest
  Remove Q_ASSERT from QItemModel autotest
  Remove Q_ASSERT's from qxmlquery autotest
  Remove Q_ASSERT from qxmlquery autotest
  Remove Q_ASSERT's from QXmlStream autotest
  Remove Q_ASSERT from qabstractxmlnodemodel test
  Remove Q_ASSERT from qscriptvaluegenerated test
  Remove Q_ASSERT from QVariant autotest
  Remove Q_ASSERT's from QTreeView autotest
  Remove Q_ASSERT from qtesselator autotest
  Remove unused function from qtessellator autotest
  Remove Q_ASSERT from qscriptvaluegenerated test
  Remove Q_ASSERT's from qscriptvaluegenerated test
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
index 9ff086c..0927577 100644
--- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -3594,7 +3594,7 @@ void tst_QGraphicsScene::task160653_selectionChanged()
             item->flags() | QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
         item->setSelected(true);
     }
-    Q_ASSERT(scene.items().size() > 1);
+    QVERIFY(scene.items().size() > 1);
     QCOMPARE(scene.items().size(), scene.selectedItems().size());
 
     QSignalSpy spy(&scene, SIGNAL(selectionChanged()));