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 00:37:23 +0000 (10:37 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 00:37:23 +0000 (10:37 +1000)
commit61fbcd95f06b288ff3ec1ddb44e5a1a16ebb8373
treec8d046edacecbb77cd9f4efc6b190baac6274049
parentf0bca208b1423e5b53cc6279a8b4cc3d752a0745
parentc028fd12c6330a071e4a216dd12aec90bac48f4b
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 Qt3Support code from QVariant autotest.
  Remove obsolete test data
  Remove Qt3Support code from QMenuBar test, part 2.