diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-19 12:18:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-19 12:18:09 (GMT) |
| commit | 2555b0f9b106f166589a806b822c184ba1ddc0c6 (patch) | |
| tree | 34ece1e7c902bce1f50e0559636c5729e138b13f /doc/src | |
| parent | 7956bfe376baddccaf1fd150ffc62cdd158c8030 (diff) | |
| parent | eda46dc0ce7ed342d1dac4daba85724c27056921 (diff) | |
| download | Qt-2555b0f9b106f166589a806b822c184ba1ddc0c6.zip Qt-2555b0f9b106f166589a806b822c184ba1ddc0c6.tar.gz Qt-2555b0f9b106f166589a806b822c184ba1ddc0c6.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix a bug in resizing the anomaly browser demo.
doc: Added a missing \sa command, plus a \l in the text.
Improve the performance of the Anomaly browser demo
Fixed crash when parsing invalid polygons in svgs.
doc: Fixed typos.
Fixed QResource to respect the explicitely set locale
Change QHostInfo to use 5 parallel lookup threads
Doc: fix typo
fix Cocoa build
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/qt4-intro.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index fb1d0e4..a90544f 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -549,7 +549,7 @@ the state machine, it is also easier to use the framework for animating GUIs, for instance. - See \l{The State Machine Framework} documentation for more infromation. + See \l{The State Machine Framework} documentation for more information. \section1 Multi-Touch and Gestures |