diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-18 14:59:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-18 14:59:08 (GMT) |
| commit | d418a8336d610f9d8d4d1e75d55cadeec24eef7a (patch) | |
| tree | 5ff831e6ac944c4bedd49bec6ed111ed0be89c61 /doc | |
| parent | 99e1dc904eab4b38c90803f13d73f90b9c048920 (diff) | |
| parent | e581386148a9615ef6c11eb3ae6735d0fa9668f6 (diff) | |
| download | Qt-d418a8336d610f9d8d4d1e75d55cadeec24eef7a.zip Qt-d418a8336d610f9d8d4d1e75d55cadeec24eef7a.tar.gz Qt-d418a8336d610f9d8d4d1e75d55cadeec24eef7a.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:
doc: Added a missing \sa command, plus a \l in the text.
Improve the performance of the Anomaly browser demo
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')
| -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 |