Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 6 Aug 2010 16:18:54 +0000 (18:18 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 6 Aug 2010 16:18:54 +0000 (18:18 +0200)
commite12448b0e00a70377591fbe9b3180dcb5f37e533
tree349f5651c19350221bdfbbb2a46b38207e8086e2
parentc17c9b4c0a62ca63d7c7647e7c8ef8a4c719da2f
parent6eb7a210eed1b392431fc913d13d205b8ccc1933
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fixes for combining multiple Qt::ImhXXXOnly with S60 FEP
  fix compile error
  Test code for input method hints
  Make input methods work correctly with Symbian^3 FEP in numeric mode