diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-11-18 01:19:33 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-11-18 01:19:33 (GMT) |
commit | 051793b7558ed16dfcb84f62ce3bd4a1545906a7 (patch) | |
tree | 2496fdaec40857e9982c93d18107e09e233145d4 /src/gui/widgets/qtextedit.cpp | |
parent | 14ddf44ce2fdd7195741b9683226a3cd774e17e4 (diff) | |
parent | cca7c5b40751e2192ba2c7c7422557eeb5672a17 (diff) | |
download | Qt-051793b7558ed16dfcb84f62ce3bd4a1545906a7.zip Qt-051793b7558ed16dfcb84f62ce3bd4a1545906a7.tar.gz Qt-051793b7558ed16dfcb84f62ce3bd4a1545906a7.tar.bz2 |
Merge remote branch 'qt/4.7' into 4.7
Conflicts:
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
Diffstat (limited to 'src/gui/widgets/qtextedit.cpp')
-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() */ |