projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dd675dc c5f4690)
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration v4.7.4
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 23 Aug 2011 07:00:48 +0000 (17:00 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 23 Aug 2011 07:00:48 +0000 (17:00 +1000)
commit092cd760d5fddf9640a310214fe01929f0fff3a8
tree2c8b8b0e6462981fc92011b384358ad9a28f3450tree | snapshot
parentdd675dc4706dff26bf154686f158f6c252727bcccommit | diff
parentc5f46907fbc0354aacc4bc4a6f5ab97c8b656d1acommit | diff
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 problem with grabWindow on Mac OS X 10.6 with Cocoa
  don't crash when destroying children
  Fix compile issue with Mac OS X 10.5
  Fix QPixmap::grabWindow() on Mac OS X Lion
  Update 4.7.4 changes
tools/qdoc3/node.cpp diff1 | diff2 | blob | history
6b46b7419a5aee9bd5fce67b7bfa8afe8e