diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 10:04:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 10:04:56 (GMT) |
| commit | ac0de5f1d783a32b4d3d40bf28daa1b252764483 (patch) | |
| tree | a294d1abbc463206c07ee596ed9f4df5355083eb /doc/src/snippets | |
| parent | 01245bcabf97dfdfdd23a2ec075b8de3e78bdeb2 (diff) | |
| parent | 8f8ad618261875e173c0e1d3931c1b7dd838d152 (diff) | |
| download | Qt-ac0de5f1d783a32b4d3d40bf28daa1b252764483.zip Qt-ac0de5f1d783a32b4d3d40bf28daa1b252764483.tar.gz Qt-ac0de5f1d783a32b4d3d40bf28daa1b252764483.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: Fixed several typos.
Doc: remove \preliminary tag from public multimedia classes
Diffstat (limited to 'doc/src/snippets')
| -rw-r--r-- | doc/src/snippets/code/doc_src_porting4.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/code/doc_src_porting4.qdoc b/doc/src/snippets/code/doc_src_porting4.qdoc index 4d24ba3..2f76591 100644 --- a/doc/src/snippets/code/doc_src_porting4.qdoc +++ b/doc/src/snippets/code/doc_src_porting4.qdoc @@ -452,7 +452,7 @@ QSimpleRichText richText(text, font); // Set the width of the paragraph to w richText.setWidth(w); -// Or set a resonable default size +// Or set a reasonable default size richText.adjustSize(); // Query for its used size |