summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@nokia.com>2011-03-09 08:19:10 (GMT)
committerJerome Pasion <jerome.pasion@nokia.com>2011-03-09 08:19:10 (GMT)
commit97bc06f9129abdeda2f58dd001b6c5a596e22e41 (patch)
tree520c4f02a96e750d16c34e67412a92b7fe755073 /doc
parent133db91952ede661750489d5d0d1eea32cc60994 (diff)
parenta2b2961fb9050c26ef99ebadb642f4178185a31f (diff)
downloadQt-97bc06f9129abdeda2f58dd001b6c5a596e22e41.zip
Qt-97bc06f9129abdeda2f58dd001b6c5a596e22e41.tar.gz
Qt-97bc06f9129abdeda2f58dd001b6c5a596e22e41.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'doc')
-rw-r--r--doc/src/examples/rogue.qdoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/examples/rogue.qdoc b/doc/src/examples/rogue.qdoc
index 94539ad..4df0910 100644
--- a/doc/src/examples/rogue.qdoc
+++ b/doc/src/examples/rogue.qdoc
@@ -190,8 +190,8 @@
\snippet examples/statemachine/rogue/movementtransition.h 2
When \c onTransition() is invoked, we know that we have a
- \l{QEvent::}{KeyPress} event with 2, 4, 6, or 8, i.e., the event
- is already unwrapped.
+ \l{QEvent::}{KeyPress} event with 2, 4, 6, or 8, and can ask \c
+ Window to move the player.
\section1 The Roguelike Tradition