Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 11 May 2011 13:47:33 +0000 (23:47 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 11 May 2011 13:47:33 +0000 (23:47 +1000)
commit1a1af689fcaea5952794ceb74d6be0aa4638d6d1
tree83dab9ac1502429b150b30e495e9a8133eaff363
parent83aa91f550c28f33bacfc132ad514e29732b60f4
parenta1d91af499ccd4721f792400e96bf0d9c32a0daa
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fix tst_QVariant::invalidColor
  Move QTextCursor::MoveStyle to Qt namespace
  Add some QRawFont related low level functions to avoid extra copying