Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 9 Dec 2011 00:12:27 +0000 (10:12 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 9 Dec 2011 00:12:27 +0000 (10:12 +1000)
commite58d9576d9d43b9aaf486f2be399d52aa000bfca
treeddaf73a5f2256cd9593e43eb3dd6b75680da624f
parent402c94b57b954e59e8a2e578b8cf6cddc6b9d45e
parent3a4ab399b2130ae204d52f3b74d33f636b9212b4
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
  Updated WebKit to 83439de78841f9569ad78e3a84b7b888337b5d18
  Symbian: Fix language mappings for localize_deployment
  Symbian: Only localize the application .rss that needs it, not all .rss
  Revert "Fix sqlite driver memory eating due to close failure"
  tests: make tests compile or disable those which don't compile
  Reduce unnecessary QtCore DLL loads during Symbian app thread creation
  Fix HarfBuzz Thai character SARA AM handling