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>
Sun, 28 Aug 2011 08:53:38 +0000 (18:53 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Sun, 28 Aug 2011 08:53:38 +0000 (18:53 +1000)
commitec6065c51e1821a7364e66d7500c17d2575ea334
treea0de2f98ccdaebe9897ba139c74fd5818394f2e2
parenta1d7aec1023726b9502ec860cff70d75f6dafe1e
parentac51ebee5bcc975829cf59012dfe9bb198016ed1
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:
  Porting the QTBUG-21084 fix to 4.7.4