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>
Sat, 31 Dec 2011 13:08:07 +0000 (23:08 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Sat, 31 Dec 2011 13:08:07 +0000 (23:08 +1000)
commit7e29bc1d96e9508616e42f2deb3346f7daef6ce4
treea4186a6d7c5e37cff815eba29fe9cc4deacbb844
parent56d84df24c891d23d65c1578d7339497d00679e3
parent4ddc7c52d6c00239f97e85c7fc5c20a0f87d3539
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:
  Revert "Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny"
  Doc: Add `-xunitxml' option to qtestlib documentation
  Fix crash in positionInLigature
  Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny