diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2011-12-09 15:15:21 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-14 11:53:32 +0100 |
| commit | 85328b975027c6e26bcaf2dd660acd3118049fd2 (patch) | |
| tree | 64a241bc3155f01227a7c2867ae358005e75005e /src/qtquick1/graphicsitems | |
| parent | b0133b8fa4b1ad9a887fa6718983711b560a35ef (diff) | |
TextEdits to include tentative commit in text property
Similar to what qtbase 1dbfbf4c66187e7522888c19d78024cfceaea570
did for QTextEdit. Now available only in plain text, html support
pending.
Change-Id: I0b23a45fc484512d3354f66e1a6134e2d70eb8b5
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Diffstat (limited to 'src/qtquick1/graphicsitems')
| -rw-r--r-- | src/qtquick1/graphicsitems/qdeclarativetextedit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qtquick1/graphicsitems/qdeclarativetextedit.cpp b/src/qtquick1/graphicsitems/qdeclarativetextedit.cpp index b547deacca..8013d40a2d 100644 --- a/src/qtquick1/graphicsitems/qdeclarativetextedit.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativetextedit.cpp @@ -130,10 +130,10 @@ QString QDeclarative1TextEdit::text() const #ifndef QT_NO_TEXTHTMLPARSER if (d->richText) - return d->document->toHtml(); + return d->control->toHtml(); else #endif - return d->document->toPlainText(); + return d->control->toPlainText(); } /*! |