diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-06-28 12:23:01 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-04 03:29:58 +0200 |
| commit | ac9b09d4299bae22f6aa4b5423092167761d1c8d (patch) | |
| tree | 265123cac1d566ebf0e1add144dd20ca4da70e9a /src/quick/items/qquicktextedit.cpp | |
| parent | 8c27b2ffebc7e8004113091de46b17ab455c8648 (diff) | |
Add tests for triple click text selection in TextEdit.
Includes a minor behavioural fix for selectedText and getText so that
they return plain text strings for plain text content rather than the
raw text from QTextDocument which substitutes line break characters
with unicode line or paragraph separator character. Rich text
documents still return the unicode characters.
Change-Id: I19a3a5bba2e4ebb0e6607e19c915a588a9a6c7db
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/items/qquicktextedit.cpp')
| -rw-r--r-- | src/quick/items/qquicktextedit.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 1e737e458d..81aabd2bf9 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -1005,7 +1005,13 @@ int QQuickTextEdit::selectionEnd() const QString QQuickTextEdit::selectedText() const { Q_D(const QQuickTextEdit); - return d->control->textCursor().selectedText(); +#ifndef QT_NO_TEXTHTMLPARSER + return d->richText + ? d->control->textCursor().selectedText() + : d->control->textCursor().selection().toPlainText(); +#else + return d->control->textCursor().selection().toPlainText(); +#endif } /*! @@ -2065,7 +2071,13 @@ QString QQuickTextEdit::getText(int start, int end) const QTextCursor cursor(d->document); cursor.setPosition(start, QTextCursor::MoveAnchor); cursor.setPosition(end, QTextCursor::KeepAnchor); - return cursor.selectedText(); +#ifndef QT_NO_TEXTHTMLPARSER + return d->richText + ? cursor.selectedText() + : cursor.selection().toPlainText(); +#else + return cursor.selection().toPlainText(); +#endif } /*! |