summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-16 11:18:58 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-16 11:18:58 (GMT)
commit7e395e4f5a89dd43d1b7b88f12e0fa4107756d54 (patch)
tree78c8d9fa559b5886f560bbe0c66773de0e66d6f9 /doc
parentdc06f11f6e95c346b1a24a9612c6045a05ff985d (diff)
parent5dedcd3c4cac993949295d109804a8f7cc3a5b0a (diff)
downloadQt-7e395e4f5a89dd43d1b7b88f12e0fa4107756d54.zip
Qt-7e395e4f5a89dd43d1b7b88f12e0fa4107756d54.tar.gz
Qt-7e395e4f5a89dd43d1b7b88f12e0fa4107756d54.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: diagramscene example: fix leak and crashes.
Diffstat (limited to 'doc')
-rw-r--r--doc/src/examples/diagramscene.qdoc3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/src/examples/diagramscene.qdoc b/doc/src/examples/diagramscene.qdoc
index f4d6b0d..7c643c2 100644
--- a/doc/src/examples/diagramscene.qdoc
+++ b/doc/src/examples/diagramscene.qdoc
@@ -265,7 +265,8 @@
\snippet examples/graphicsview/diagramscene/mainwindow.cpp 3
- This slot deletes the selected item, if any, from the scene. If
+ This slot deletes the selected item, if any, from the scene. It
+ deletes the arrows first in order to avoid to delete them twice. If
the item to be deleted is a \c DiagramItem, we also need to delete
arrows connected to it; we don't want arrows in the scene that
aren't connected to items in both ends.