diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-13 16:02:05 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-13 16:02:05 (GMT) |
| commit | dc5c5104a3f31b03954b33e1c098e17bc4634f27 (patch) | |
| tree | 6e4961f5154a64196435688d4895e5222046634b /doc/src | |
| parent | 82b3e65875fe018c2571d83dabe87bb396e8b60a (diff) | |
| parent | e1b03bac22f87edbbe78eba366966259be6eb0ed (diff) | |
| download | Qt-dc5c5104a3f31b03954b33e1c098e17bc4634f27.zip Qt-dc5c5104a3f31b03954b33e1c098e17bc4634f27.tar.gz Qt-dc5c5104a3f31b03954b33e1c098e17bc4634f27.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
dist/changes-4.6.1
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/examples/moveblocks.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/examples/moveblocks.qdoc b/doc/src/examples/moveblocks.qdoc index 2d0787a..f3e8ce5 100644 --- a/doc/src/examples/moveblocks.qdoc +++ b/doc/src/examples/moveblocks.qdoc @@ -60,7 +60,7 @@ states. \o \c StateSwitchTransition is a custom transition that triggers on \c{StateSwitchEvent}s. - \o \c StateSwitchEvent is a QEvent that trigger \c{StateSwitchTransition}s. + \o \c StateSwitchEvent is a QEvent that triggers \c{StateSwitchTransition}s. \o \c QGraphicsRectWidget is a QGraphicsWidget that simply paints its background in a solid \l{Qt::}{blue} color. \endlist @@ -141,7 +141,7 @@ Finally, we can create the state machine, add our initial state, and start execution of the state graph. - \section2 The \c createGemetryState() Function + \section2 The \c createGeometryState() Function In \c createGeometryState(), we set up the geometry for each graphics item. @@ -155,7 +155,7 @@ \section1 The StateSwitcher Class \c StateSwitcher has state switch transitions to each \l{QState}s - we created with \c createGemetryState(). Its job is to transition + we created with \c createGeometryState(). Its job is to transition to one of these states at random when it is entered. All functions in \c StateSwitcher are inlined. We'll step through |