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>
Mon, 4 Jul 2011 10:36:43 +0000 (20:36 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 4 Jul 2011 10:36:43 +0000 (20:36 +1000)
commit1d7d827eca37bafe5bfff5ab6bad0056beac9d5d
tree4c99b10b17f2e19245ae122886b2c90aab37e5a3
parent296f64a839a6af458a98d36da4836cab1d5cbb8e
parent685d89b68dd11263d53a2c0982f057965f7262f2
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:
  Regression: QS60Style - All standardIcons are drawn as "small icons"