diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-13 08:36:00 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-13 08:36:00 (GMT) |
| commit | 03a55630cfccf7f6ed01d865c541e07afb25c96e (patch) | |
| tree | 25b4fe750bccad037068ca043b700db0b2cceef4 /doc/src/snippets/code | |
| parent | 8e309899b8287b67905072927df1e00effc2a13e (diff) | |
| parent | de20fdfb1da72d2ad89689f46f8412c04c25fc96 (diff) | |
| download | Qt-03a55630cfccf7f6ed01d865c541e07afb25c96e.zip Qt-03a55630cfccf7f6ed01d865c541e07afb25c96e.tar.gz Qt-03a55630cfccf7f6ed01d865c541e07afb25c96e.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-master-from-4.6
Conflicts:
qmake/generators/symbian/symmake.cpp
Diffstat (limited to 'doc/src/snippets/code')
| -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 |