summaryrefslogtreecommitdiffstats
path: root/doc/src/examples
diff options
context:
space:
mode:
authorartoka <arto.katajasalo@digia.com>2011-12-13 10:06:14 (GMT)
committerQt Commercial Integration <QtCommercial@digia.com>2012-01-31 10:25:07 (GMT)
commit3e42111e96e18fd60ec6d6b8b386c2f4a4b401ac (patch)
treef1a207c1347398428a886857a5c3c3f2ab4e5d84 /doc/src/examples
parent8392eebfdacdcb7d318e786eafffc2d48db77bcc (diff)
downloadQt-3e42111e96e18fd60ec6d6b8b386c2f4a4b401ac.zip
Qt-3e42111e96e18fd60ec6d6b8b386c2f4a4b401ac.tar.gz
Qt-3e42111e96e18fd60ec6d6b8b386c2f4a4b401ac.tar.bz2
Various qt documentation fixes (wk 40&41)
Fixes for bugs: QTBUG-21067, QTBUG-17025, QTBUG-11489, QTBUG-20069, QTBUG-3563, QTBUG-20089, QTBUG-13983, QTBUG-11820, QTBUG-14732, QTBUG-14521, QTBUG-9675, QTBUG-18313, QTBUG-18313, QTBUG-11312, QTBUG-17739, QTBUG-7678, QTBUG-14759, QTBUG-14756, QTBUG-14677, QTBUG-16164, QTBUG-20721, QTBUG-15562, QTBUG-17029 and QTBUG-18544.
Diffstat (limited to 'doc/src/examples')
-rw-r--r--doc/src/examples/diagramscene.qdoc12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/examples/diagramscene.qdoc b/doc/src/examples/diagramscene.qdoc
index 7d3c0e6..38875ed 100644
--- a/doc/src/examples/diagramscene.qdoc
+++ b/doc/src/examples/diagramscene.qdoc
@@ -149,11 +149,11 @@
Example}{application example} if you need a high-level
introduction to actions.
- The is the \c createMenus() function:
+ Here is the \c createMenus() function:
\snippet examples/graphicsview/diagramscene/mainwindow.cpp 24
- We create the three menus' of the example.
+ We create the three menus of the example.
The \c createToolbars() function sets up the examples tool
bars. The three \l{QToolButton}s in the \c colorToolBar, the \c
@@ -199,7 +199,7 @@
each button; we store the diagram's type, i.e., the
DiagramItem::DiagramType enum. We use the stored diagram type when
we create new diagram items for the scene. The widgets created
- with this function is used in the tool box.
+ with this function are used in the tool box.
Here is the \c createColorMenu() function:
@@ -443,7 +443,7 @@
In the \c DiagramScene a mouse click can give three different
actions: the item under the mouse can be moved, an item may be
- inserted, or an arrow may be connected between to diagram items.
+ inserted, or an arrow may be connected between two diagram items.
Which action a mouse click has depends on the mode, given by the
Mode enum, the scene is in. The mode is set with the \c setMode()
function.
@@ -456,7 +456,7 @@
inserted is set with the \c setItemType() slot.
The \c MainWindow and \c DiagramScene share responsibility for
- the examples functionality. \c MainWindow handles the following
+ the example's functionality. \c MainWindow handles the following
tasks: the deletion of items, text, and arrows; moving diagram
items to the back and front; and setting the scale of the scene.
@@ -624,7 +624,7 @@
\snippet examples/graphicsview/diagramscene/diagramitem.cpp 0
- In the constructor we create the items polygon according to
+ In the constructor we create the item's polygon according to
\a diagramType. \l{QGraphicsItem}s are not movable or selectable
by default, so we must set these properties.