From: Qt Continuous Integration System <qt-info@nokia.com>
Date: Wed, 11 May 2011 13:47:33 +0000 (+1000)
Subject: Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
X-Git-Tag: qt-v5.0.0-alpha1~4315
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1a1af689fcaea5952794ceb74d6be0aa4638d6d1;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:
  Fix tst_QVariant::invalidColor
  Move QTextCursor::MoveStyle to Qt namespace
  Add some QRawFont related low level functions to avoid extra copying
---

1a1af689fcaea5952794ceb74d6be0aa4638d6d1