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, 16 Jun 2011 07:08:34 +0000 (17:08 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 16 Jun 2011 07:08:34 +0000 (17:08 +1000)
commit61aae4e9a033bfb59664105e5377fd086bacb517
tree92f6f6d70713be3e0033c6cf841e0b4e87e33512
parent3efaed62e11e9e461f7244a99a233140b9f28510
parent6fa05b234e2bb6fdabcaf5eb4550b0b32a434fd1
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:
  Fixes to how resize event and layout request are posted.
  Fixed move a QGraphicsWidget and invalidate its layout at the same time
  Fix infinite recursion when changing geometry on Mac