summaryrefslogtreecommitdiffstats
path: root/src/widgets/doc
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-07-10 10:11:10 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-07-10 10:11:11 +0200
commitf035786021e9f7b1d9512b22774bc15553caaedb (patch)
treec46a29ed3657944d9f36d8643a99fad469235bc4 /src/widgets/doc
parent72024fd50cdead8d890886dba32fd81ac54ff3ae (diff)
parent916c9d469bd0df227dc3be97fcca27e3cf58144f (diff)
Merge remote-tracking branch 'origin/5.3' into dev
Diffstat (limited to 'src/widgets/doc')
-rw-r--r--src/widgets/doc/src/graphicsview.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/doc/src/graphicsview.qdoc b/src/widgets/doc/src/graphicsview.qdoc
index 148b4ea47d..d1d8630935 100644
--- a/src/widgets/doc/src/graphicsview.qdoc
+++ b/src/widgets/doc/src/graphicsview.qdoc
@@ -301,7 +301,7 @@
pass a QPainterPath to mapToScene(), and then pass the mapped path
to QGraphicsScene::items().
- You can map coordinates and shapes to and from and item's scene by
+ You can map coordinates and shapes to and from an item's scene by
calling QGraphicsItem::mapToScene() and
QGraphicsItem::mapFromScene(). You can also map to an item's parent
item by calling QGraphicsItem::mapToParent() and