Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 May 2011 16:37:41 +0000 (02:37 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 May 2011 16:37:41 +0000 (02:37 +1000)
commit61e7b85a146778ce5907000733f246e4ebdce26a
tree9f9ed31734f976b9b39b33f7e6694ea977bc9a2f
parent3d27a19ca009836b812b59c3359db1369d391181
parente2320ec17446dc6e851fcf4ea2d998177b0d8049
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix instability in QNetworkConfigurationManager autotest
  Support word selection list with predictive text from splitview
  Fix softkey icon positioning in S60 5.3