Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 4 Aug 2011 13:58:20 +0000 (23:58 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 4 Aug 2011 13:58:20 +0000 (23:58 +1000)
commit82a18deee74bef3e545bf6426164dbe12548e5d9
tree3ee31f4755292a0077e10d723804491f2ba794d3
parent920ce5ed71bc456e429b887801a8d8bea7a3db0d
parent0857745f8cb6a26528cecd6e07f0d9267fc75ac6
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
  runonphone: fix failure to terminate
  Fix license headers in new files from coda patch
  runonphone: command line args improperly passed to TRK after CODA patch
  Preventing QSoftkeyManager giving false positive memory leaks
  Fixed memory leak in QMessageBox::setInformativeText in Symbian
  Memory leak fix in Symbian open file dialog
  Runonphone with CODA support
  Memory leak fix for Symbian menus
  Eabi DEF file sync between Qt 4.7 and 4.8
  Winscw DEF file sync between Qt 4.7 and 4.8