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>
Wed, 3 Nov 2010 11:06:47 +0000 (12:06 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 3 Nov 2010 11:06:47 +0000 (12:06 +0100)
commitd5f33087eca066d70240e272d4109c5cca8001cf
treecc232f3d0e9df3b1c26b511fea965d956ac545d7
parent69ab0cd2b51a86fe27c92c7c18390f6791939b53
parent6382a038d6394135a4dc2d8e1e47133d9ea0b659
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:
  Qt/Symbian: QInputDialog layout and size are wrong