diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-15 22:11:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-15 22:11:48 (GMT) |
| commit | 32817efdfec402f2e839535c326a49f884cb984f (patch) | |
| tree | ea8fc0df21f00b7de1ca88149e61df6b4607d945 | |
| parent | 1b906e167c4eec4a8b4e99f97faad3a0f095b51b (diff) | |
| parent | 32f8c01196f6ebc2bd18ee9f66929bdba61fea20 (diff) | |
| download | Qt-32817efdfec402f2e839535c326a49f884cb984f.zip Qt-32817efdfec402f2e839535c326a49f884cb984f.tar.gz Qt-32817efdfec402f2e839535c326a49f884cb984f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
doc: Fix documentation of QTextEdit::setDocument
| -rw-r--r-- | src/gui/widgets/qtextedit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qtextedit.cpp b/src/gui/widgets/qtextedit.cpp index 4541730..6b3f444 100644 --- a/src/gui/widgets/qtextedit.cpp +++ b/src/gui/widgets/qtextedit.cpp @@ -773,7 +773,7 @@ Qt::Alignment QTextEdit::alignment() const is the document's parent object. The parent object of the provided document remains the owner of the object. - If the current document is a child of the text editor, then it is deleted. + The editor does not delete the current document, even if it is a child of the editor. \sa document() */ |