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>
Tue, 18 Jan 2011 16:01:27 +0000 (02:01 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 18 Jan 2011 16:01:27 +0000 (02:01 +1000)
commit44edbab6f4063565d74f8ebf9ccdacabed5ef5ba
treef23f8809e3cc9865f5cdcae3e4426b1372b32362
parentae4b284a0e9fddf052fe8043940a995533ffe7c8
parent62729b8eaa35c620143f79c0b244e295c3eddbca
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:
  Revert "Add a warning about trying to release a timer ID that isn't active"
  Some unit tests for layout explosion thingy
  Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005f
  Build failure fix (related to QT-4079)
  QWidgets support for VGA screen