Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  tests: fix private header inclusion in qtbase autotests
  tests: disable tests in qtbase which depend on qtsvg
  tests: make benchmarks compile or disable those which don't compile
  tests: remove references to benchmark directories which don't exist
  tests: enable compilation of autotests for qtbase by default
  tests: make tst_qrawfont compile for QGlyphs -> QGlyphRun API change
  tests: mark some tests as using private API