Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 18 May 2011 01:03:00 +0000 (11:03 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 18 May 2011 01:03:00 +0000 (11:03 +1000)
commitaabda9f5c63ec37ff1669461de6a408bb4865fda
tree5d59d83c15f75dacad3036065603e0dd0a8e7727
parenteab70faca3ade07eb1a39f83a81887e42f483681
parent6e50394c4eac9b3e91f6df7e944181cf7f54b0fe
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: (84 commits)
  Reduce usage of Q_ASSERT in autotests.
  Fixed license header.
  Remove Q_ASSERT's from qsharedmemory autotest
  Remove Q_ASSERT's from QNetworkReply autotest
  Remove Q_ASSERT from QXmlStream autotest
  Remove Q_ASSERT's from QXmlStream autotest
  Remove Q_ASSERT from QItemModel autotest
  Remove Q_ASSERT's from QXmlStream autotest
  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's from qreadwritelock autotest
  Remove Q_ASSERT's from QObject autotest
  Remove Q_ASSERT's from QObject autotest
  Remove Q_ASSERT's from QNetworkReply autotest
  Remove Q_ASSERT from qitemmodel autotest
  Remove Q_ASSERT's from QMutex autotest
  Remove Q_ASSERT from QMetaType autotest
  Remove Q_ASSERT's in qitemview autotest
  ...