Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 01:39:07 +0000 (11:39 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 01:39:07 +0000 (11:39 +1000)
commitff08e8c009323eadd3df79100979cbb937d8e1e3
tree399388a773fd741e6cf1f129e5796d642e3e0421
parent61fbcd95f06b288ff3ec1ddb44e5a1a16ebb8373
parentf5e39ca5410c4c94434b85918f15f10a4684d768
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Remove mention of qt3support in makeselftest
  Remove Qt3Support test data from lancelot test
  Remove Qt3Support code from algorithms autotest
  Don't link qt3support lib in QMessageBox autotest