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>
Fri, 19 Aug 2011 06:14:00 +0000 (16:14 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 19 Aug 2011 06:14:00 +0000 (16:14 +1000)
commit2f5855e8d891a7e93bdb721243f1c0b10fcb5ad9
tree7e51853776d1c980955b432634f0f24a71643f1e
parent0cb57328453c476b01b058d57211afee197d6a82
parent4e40c388aef3cb16a1492764c37ae8ba929e8aef
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 non-ascii name issues in ICD.
  Compile fix for Symbian 5th and earlier
  fix copying webkit guide under windows
  Symbian: Fix backspace on empty lines of multiline textedits