Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 5 Jul 2011 00:58:56 +0000 (10:58 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 5 Jul 2011 00:58:56 +0000 (10:58 +1000)
commit601b12b7879e9a743ef9e516470219aae73e611d
treec67e629b794fcba02773080ae7cf834901466363
parentf41bc5d3f15d65d1e35647dec71bf7f452286827
parentc018f01b8a97e9ae3dee12777fd1bde4c51f231e
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  Fix horizontal center alignment with trailing space
  Regression: QS60Style - All standardIcons are drawn as "small icons"
  QS60Style: provide more standard icons
  Update QtOpenGL section in Symbian platform notes.
  The qmlshadersplugin deployment must be scoped same as its building
  Do not try to open VKB if it is already open in Symbian
  Introduce QPixmap::fromSymbianRSgImage(RSgImage*) to GL engine