diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-03 14:29:41 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-03 14:30:21 +0100 |
commit | b5ab7ee0d78a30863e3d11bd2ba10ba5f4854bf5 (patch) | |
tree | d4ab3471f9f92e153fe320e0435a5740c794746b /examples | |
parent | ad9554a7f2d4b8a2af3efabc7bc69b9a0ae3751d (diff) | |
parent | aff3e3c4a20aae52fdafaede8dfcbde2bc990104 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Id13badc270db98806048753fd7fb658aa17f1ede
Diffstat (limited to 'examples')
-rw-r--r-- | examples/widgets/doc/src/diagramscene.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/widgets/doc/src/diagramscene.qdoc b/examples/widgets/doc/src/diagramscene.qdoc index 92048cdcaf..32168f59ee 100644 --- a/examples/widgets/doc/src/diagramscene.qdoc +++ b/examples/widgets/doc/src/diagramscene.qdoc @@ -507,7 +507,7 @@ \snippet graphicsview/diagramscene/diagramscene.cpp 5 - \c DiagramTextItems emit a signal when they loose focus, which is + \c DiagramTextItems emit a signal when they lose focus, which is connected to this slot. We remove the item if it has no text. If not, we would leak memory and confuse the user as the items will be edited when pressed on by the mouse. @@ -715,7 +715,7 @@ \snippet graphicsview/diagramscene/diagramtextitem.cpp 2 - \c DiagramScene uses the signal emitted when the text item looses + \c DiagramScene uses the signal emitted when the text item loses focus to remove the item if it is empty, i.e., it contains no text. |