diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-09 09:21:48 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-09 09:21:48 +0200 |
| commit | 2eead078c86a4d24403d3d1ba737dbc3096a8b42 (patch) | |
| tree | 58b8da96c63fe4c1e59d3707f0b633592210a82d /examples/widgets/doc | |
| parent | 94902905ec203626abc050744d14898674dc2bbd (diff) | |
| parent | 89d0a03c067b42155b1a2d310f8514f595abfd61 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: If8e9d88771243fd9e221b49f53d7d8b111a8ce2a
Diffstat (limited to 'examples/widgets/doc')
| -rw-r--r-- | examples/widgets/doc/src/collidingmice-example.qdoc | 3 | ||||
| -rw-r--r-- | examples/widgets/doc/src/diagramscene.qdoc | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/examples/widgets/doc/src/collidingmice-example.qdoc b/examples/widgets/doc/src/collidingmice-example.qdoc index 657c416218..984d3244f9 100644 --- a/examples/widgets/doc/src/collidingmice-example.qdoc +++ b/examples/widgets/doc/src/collidingmice-example.qdoc @@ -75,7 +75,8 @@ \section1 Mouse Class Definition When constructing a mouse item, we first ensure that all the item's - private variables are properly initialized: + private variables which were no yet initialized directly in the class + are properly initialized: \snippet graphicsview/collidingmice/mouse.cpp 0 diff --git a/examples/widgets/doc/src/diagramscene.qdoc b/examples/widgets/doc/src/diagramscene.qdoc index 860dcc5cb9..1a94d53162 100644 --- a/examples/widgets/doc/src/diagramscene.qdoc +++ b/examples/widgets/doc/src/diagramscene.qdoc @@ -643,7 +643,9 @@ This function is called when the item is removed from the scene and removes all arrows that are connected to this item. The arrow must be removed from the \c arrows list of both its start and end - item. + item. Since either the start or the end item is the object where + this function is currently called, we have to make sure to work on + a copy of arrows since removeArrow() is modifying this container. Here is the \c addArrow() function: |