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, 15 Oct 2010 16:24:00 +0000 (18:24 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 15 Oct 2010 16:24:00 +0000 (18:24 +0200)
commit1c38e7c2107b7cb7ff997126ded3819d760a3191
treef4f378a1ddb6ffb5e4c48931ed4da0ff8e1fb2e8
parentc2f542ee646b8e4bd87e6078dc9c83b661229f41
parent05231f486b93dfb3992bfb96568f8c71d877e104
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 epocroot handling in createpackage.pl script
  Make s60pixelmetrics harvester utility app more robust
  Implemented Qt::WA_ShowWithoutActivating for Symbian.
  Clean up ARM SIMD drawhelper code and make sure it works.