Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 May 2011 01:48:59 +0000 (11:48 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 May 2011 01:48:59 +0000 (11:48 +1000)
commit359c5e4a7199aef7d5d2964b5bf8c21673e9384d
treeeaac978146f567fbb60f8a795b3311cde2c86e68
parent0add5fe930e275924813376bb06cbfc0f5f779d3
parentdd1a7a6379181765c3e8585f8fd12fb69f67c965
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Make error checking in QSignalSpy consistent