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)
* '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


Trivial merge