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>
Mon, 17 Jan 2011 21:33:30 +0000 (07:33 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 17 Jan 2011 21:33:30 +0000 (07:33 +1000)
commit8514c4068ec81628738f1c0ef28d156fa71f4bc4
tree5a829199c445b1b827436472f2dc445191246a5a
parentf612cb0f6bf4dd06fa344b1a5862985209fa5533
parent0cfda20a6dc0d1072cfb2c58e6d1ed7c9308ac14
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