summaryrefslogtreecommitdiffstats
path: root/doc/src/examples/rogue.qdoc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-10-20 00:36:47 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-10-20 00:36:47 (GMT)
commit4673878256262802c07303fce1e1f8cc1b7e652b (patch)
treeb740f82d2ecfdfaab9726c0bdf35df80681396ba /doc/src/examples/rogue.qdoc
parent6c27b3bb33a522633a9d8d29729a22a16d93e082 (diff)
parent8051a73be276995adfc4508a0cb5ad6451e8ab45 (diff)
downloadQt-4673878256262802c07303fce1e1f8cc1b7e652b.zip
Qt-4673878256262802c07303fce1e1f8cc1b7e652b.tar.gz
Qt-4673878256262802c07303fce1e1f8cc1b7e652b.tar.bz2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (116 commits) Update Japanese translations. Updated Russian translation Update Korean translations to 4.8 qmake: fix writing of incremental linker option for vcxproj files support the obj-c #import statement in the dependency generator runonphone timestamps nanosecond formating set to 9 chars, 0 padded Put Qt translation files to rom on Symbian. Add -nn for .cpp MOC preprocessing for INTEGRITY Remove commented out code. Update Polish translations for 4.8 Fix QDeclarativeEngine::setOfflineStoragePath() for Symbian Fixes: libpng symbols exported from QtGui.dll on Windows Converting from double to qreal in gui Doc updates to installation, platform notes and symbian introduction. Fix XML schema validation failure. purge "Translation Rules for Plurals" add -list-languages option to lupdate Fix construction races in QtNetwork Removing accidental use of double instead of qreal from QLine Fix incorrect QFileInfo permissions on windows ...
Diffstat (limited to 'doc/src/examples/rogue.qdoc')
-rw-r--r--doc/src/examples/rogue.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/examples/rogue.qdoc b/doc/src/examples/rogue.qdoc
index e93886b..b872008 100644
--- a/doc/src/examples/rogue.qdoc
+++ b/doc/src/examples/rogue.qdoc
@@ -29,7 +29,7 @@
\example statemachine/rogue
\title Rogue Example
- The Rogue example shows how to use the Qt state machine for event
+ \brief The Rogue example shows how to use the Qt state machine for event
handling.
\image rogue-example.png