Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 17 May 2011 14:58:00 +0000 (00:58 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 17 May 2011 14:58:00 +0000 (00:58 +1000)
commitcb2980a09aefcc207eacb500d5a3c74f064859dd
treeb119109514d04a7afa503ecd08a774483821c8d8
parent4109badc4321effeeb798dd101479be7dffdbe3d
parent5aa1cbcdacd19b2e526e358eddac1b7d55a994b5
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
  ...
tests/auto/qsslsocket/tst_qsslsocket.cpp
tests/auto/qtextedit/tst_qtextedit.cpp
tests/auto/qvariant/tst_qvariant.cpp
tests/auto/qwidget/tst_qwidget.cpp