diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-04 11:28:14 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-04 11:28:14 (GMT) |
| commit | ce0fc2ebeaf195368c31b143a40850f01ada450a (patch) | |
| tree | 3c46a405766b4ec5a5676fca15df5d4e13ca2342 /doc/src/frameworks-technologies/richtext.qdoc | |
| parent | 39e7c4de155a150a0e7da6e40f59aadecaea0a8a (diff) | |
| parent | 74ad5ce57adedc91717ffd67e3e65b8f76d12052 (diff) | |
| download | Qt-ce0fc2ebeaf195368c31b143a40850f01ada450a.zip Qt-ce0fc2ebeaf195368c31b143a40850f01ada450a.tar.gz Qt-ce0fc2ebeaf195368c31b143a40850f01ada450a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Conflicts:
doc/src/declarative/extending.qdoc
doc/src/external-resources.qdoc
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativetransition.cpp
Diffstat (limited to 'doc/src/frameworks-technologies/richtext.qdoc')
| -rw-r--r-- | doc/src/frameworks-technologies/richtext.qdoc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/src/frameworks-technologies/richtext.qdoc b/doc/src/frameworks-technologies/richtext.qdoc index 7a5a6a6..089f84d 100644 --- a/doc/src/frameworks-technologies/richtext.qdoc +++ b/doc/src/frameworks-technologies/richtext.qdoc @@ -37,6 +37,7 @@ \ingroup frameworks-technologies \ingroup qt-basic-concepts + \ingroup best-practices \nextpage Rich Text Document Structure |