diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-16 23:00:10 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-16 23:00:10 (GMT) |
| commit | 569b076bb650c5082109d6406616c7536ac9f79f (patch) | |
| tree | 806160c2344ee83ef4a5a659e510cf621a35bd58 | |
| parent | b6e009022347820ad7d15ea01d16ae11e1c05489 (diff) | |
| parent | 13d471d63293b575ab6d5a6bf4abd02a69f07258 (diff) | |
| download | Qt-569b076bb650c5082109d6406616c7536ac9f79f.zip Qt-569b076bb650c5082109d6406616c7536ac9f79f.tar.gz Qt-569b076bb650c5082109d6406616c7536ac9f79f.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
| -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() */ |