Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 2 Feb 2011 15:30:16 +0000 (01:30 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 2 Feb 2011 15:30:16 +0000 (01:30 +1000)
commitf2d1d7a2f8a6b4a19f7ef7c91786845f2a987b59
tree58d31640d47d0b35a0285ede997dd0f2a93d2774
parent95b17fbe91eb3b1b0fcac92d8a8934769e4cd847
parentbb6d0f75d4a5d3dadb5e0134aa0270bcab61f205
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix for QTBUG-17035
  Carefull free the data from XGetWindowProperty on X11.
  Fixes memory leaks in QX11Embed