diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-01-26 10:26:57 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-01-26 10:26:57 (GMT) |
| commit | 39e7c4de155a150a0e7da6e40f59aadecaea0a8a (patch) | |
| tree | 42e98a13192f001365aead8c69000db8ee90979a /doc/src/overviews.qdoc | |
| parent | 9657c4fa2040758b8aa3a5f7f7c81442cbaba621 (diff) | |
| parent | a0177c4b9e4566f9d9edcab7b12ed77bfd823590 (diff) | |
| download | Qt-39e7c4de155a150a0e7da6e40f59aadecaea0a8a.zip Qt-39e7c4de155a150a0e7da6e40f59aadecaea0a8a.tar.gz Qt-39e7c4de155a150a0e7da6e40f59aadecaea0a8a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Fixing a merge conflict.
Conflicts:
doc/src/overviews.qdoc
Diffstat (limited to 'doc/src/overviews.qdoc')
| -rw-r--r-- | doc/src/overviews.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc index 6b14e3d..f257045 100644 --- a/doc/src/overviews.qdoc +++ b/doc/src/overviews.qdoc @@ -42,7 +42,7 @@ Qt is a cross-platform application and UI framework for writing web-enabled applications for desktop, mobile, and embedded operating systems. This page contains links to articles and overviews - explaining key components and techniuqes used in Qt development. + explaining key components and techniques used in Qt development. \generatelist {related} */ @@ -51,7 +51,7 @@ \group qt-gui-concepts \title UI Design with Qt - \brief The Qt components for constructing native look & feel desktop UI's. + \brief The Qt components for constructing native look and feel desktop UI's. These pages are about Qt's traditional set of GUI components for building both native look & feel and custom UI's for the desktop |