From: Qt Continuous Integration System <qt-info@nokia.com>
Date: Wed, 11 May 2011 07:11:28 +0000 (+1000)
Subject: Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
X-Git-Tag: qt-v5.0.0-alpha1~4321
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6954a35bb58ab2ffeb5c595b1965c8033fed4515;p=profile%2Fivi%2Fqtbase.git

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
---

6954a35bb58ab2ffeb5c595b1965c8033fed4515