Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 23 Dec 2010 01:42:29 +0000 (11:42 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 23 Dec 2010 01:42:29 +0000 (11:42 +1000)
commit74a104ebca8c69381724271152914d7a2dfbe1da
treee411d6a9f5c4529ed6d50949f5471ca3782d5497
parentbe8ad40ff0594118a5f5a883fcfff35e28c21a30
parent8a3c4c8283e4762744a29262ce507713565c1c0c
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Fix crash in indeterminate progressbars on windows
  Fix timer regression for indeterminate progressbars