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, 29 Jun 2011 23:05:32 +0000 (09:05 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 29 Jun 2011 23:05:32 +0000 (09:05 +1000)
commitf5feea56fc7202ab64a1b9c5f9b05391c2b88238
tree758b5baf983eabddea162f67c711dcf903358d9e
parent81e19a4621f59d893403a0b79770c4623efc5c3d
parentc1759aa657f5f729c96696b819465c70266c21c8
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 QWidget::palettePropagation2() autotest on Symbian (part 2)
  Fix QWidget::palettePropagation2() autotest on Symbian