Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 9 May 2011 15:16:35 +0000 (01:16 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 9 May 2011 15:16:35 +0000 (01:16 +1000)
commit4bcd4c08fe29f2446691b002a70be983871864f1
tree55277eb78bfd51152c426195aeecae8a9ffda6ec
parente8aceff19523a2fb048690798d789f0ec248696d
parent7eef0de0912a2084dda47f2a862af8e6064b9a64
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Turned on private headers for some plugins.