summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-09 22:43:54 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-09 22:43:54 (GMT)
commitbbb73124d51fe97eb0df815e406c369bec65b4bd (patch)
tree525717e8b08922c81400d2bf905f40a7a7866278 /doc
parente32bb8f0e79232419b9516fa8273eadbaa8aad9e (diff)
parent32d84d886b6c593b5f41f56ecdc418f6638b1f07 (diff)
downloadQt-bbb73124d51fe97eb0df815e406c369bec65b4bd.zip
Qt-bbb73124d51fe97eb0df815e406c369bec65b4bd.tar.gz
Qt-bbb73124d51fe97eb0df815e406c369bec65b4bd.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Doc typos fixed Translations: Update German for 4.6.1 fix test under windows don't complain about unresolved base when the reference is absolute make the lupdate tests more verbose in case of failure don't use qmake for test setup move equivalent of output_ts test to good/ look for the .result file in the dir where the output is expected to go fix sametext and number heuristics fix number heuristics, part 1 no point in specifying -ts when a .pro file is specified clean up the lupdatecmd files tidy up the test .pro files remove dead code
Diffstat (limited to 'doc')
-rw-r--r--doc/src/examples/moveblocks.qdoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/examples/moveblocks.qdoc b/doc/src/examples/moveblocks.qdoc
index 2dce477..250251d 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