Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 19 May 2011 10:04:29 +0000 (20:04 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 19 May 2011 10:04:29 +0000 (20:04 +1000)
commit77cd5455b200bf5a7d9fbc355f0fa7174630323f
treeb2c0754e5d26920a6bc8c20d3e5b869120630079
parent6772f8802d9766750372317b55d032b3457837d8
parent1b92bb9bb216ed49ddb222cdd3f523dd8d640c2f
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Compile IPC tests.
  Always call XInitThreads.
  Remove redundant #ifdef's from benchmarks
  Improve coding style of qdatastream test
  Don't use Qt3Support in arthur test suite.
  Remove Qt3Support code from QMenuBar autotest
  Remove Qt3Support code from QSplitter autotest
  Remove Qt3Support code from QSharedPointer autotest
  Remove Qt3Support code from QComboBox autotest
  Remove Qt3Support test code from accessibility autotest
  tests: allow unstable tests to be marked with CONFIG+=insignificant_test