diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-23 17:00:48 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-23 17:00:48 +1000 |
| commit | 092cd760d5fddf9640a310214fe01929f0fff3a8 (patch) | |
| tree | 2c8b8b0e6462981fc92011b384358ad9a28f3450 /tools/qdoc3/node.cpp | |
| parent | dd675dc4706dff26bf154686f158f6c252727bcc (diff) | |
| parent | c5f46907fbc0354aacc4bc4a6f5ab97c8b656d1a (diff) | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integrationv4.7.4
* '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
Diffstat (limited to 'tools/qdoc3/node.cpp')
| -rw-r--r-- | tools/qdoc3/node.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp index 87bbd93f49..189c28fc17 100644 --- a/tools/qdoc3/node.cpp +++ b/tools/qdoc3/node.cpp @@ -555,7 +555,8 @@ void InnerNode::removeFromRelated() */ void InnerNode::deleteChildren() { - qDeleteAll(children); + NodeList childrenCopy = children; // `children` will be changed in ~Node() + qDeleteAll(childrenCopy); } /*! |