diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-11-16 23:00:11 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-11-16 23:00:11 (GMT) |
| commit | 88c2e6f8f9f968c6bfe4ca0c0e3e54365a3e0c82 (patch) | |
| tree | a669b9ca5f2b501d03eac773b119ed83d8b7e66d /src | |
| parent | 918456e5899ef5e71250d4b5cf0888c58db17a07 (diff) | |
| parent | 13d471d63293b575ab6d5a6bf4abd02a69f07258 (diff) | |
| download | Qt-88c2e6f8f9f968c6bfe4ca0c0e3e54365a3e0c82.zip Qt-88c2e6f8f9f968c6bfe4ca0c0e3e54365a3e0c82.tar.gz Qt-88c2e6f8f9f968c6bfe4ca0c0e3e54365a3e0c82.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src')
| -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() */ |