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/howtos | |
| 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/howtos')
| -rw-r--r-- | doc/src/howtos/HWacceleration.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/howtos/restoring-geometry.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/howtos/sharedlibrary.qdoc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/howtos/HWacceleration.qdoc b/doc/src/howtos/HWacceleration.qdoc index 7cc3346..b5a4733 100644 --- a/doc/src/howtos/HWacceleration.qdoc +++ b/doc/src/howtos/HWacceleration.qdoc @@ -27,7 +27,7 @@ /*! \page HWAcc_rendering.html - \title Hardware Acceleration & Embedded Platforms. + \title Hardware Acceleration & Embedded Platforms. \brief How to use hardware acceleration for fast rendering. \ingroup best-practices diff --git a/doc/src/howtos/restoring-geometry.qdoc b/doc/src/howtos/restoring-geometry.qdoc index 005a29e..b3d6355 100644 --- a/doc/src/howtos/restoring-geometry.qdoc +++ b/doc/src/howtos/restoring-geometry.qdoc @@ -28,7 +28,7 @@ /*! \page restoring-geometry.html \title Restoring a Window's Geometry - \brief How to save & restore window geometry. + \brief How to save & restore window geometry. \ingroup best-practices This document describes how to save and restore a \l{Window diff --git a/doc/src/howtos/sharedlibrary.qdoc b/doc/src/howtos/sharedlibrary.qdoc index 5b47618..3e611b9 100644 --- a/doc/src/howtos/sharedlibrary.qdoc +++ b/doc/src/howtos/sharedlibrary.qdoc @@ -59,7 +59,7 @@ \endlist Now, we need to ensure that the right macro is invoked -- whether we - compile a share library itself, or just the client using the shared + compile a shared library itself, or just the client using the shared library. Typically, this can be solved by adding a special header. |