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/quick/items/qquicktextcontrol_p.h | |
| 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/quick/items/qquicktextcontrol_p.h')
| -rw-r--r-- | src/quick/items/qquicktextcontrol_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/quick/items/qquicktextcontrol_p.h b/src/quick/items/qquicktextcontrol_p.h index e8bfe14766..2e42625fdc 100644 --- a/src/quick/items/qquicktextcontrol_p.h +++ b/src/quick/items/qquicktextcontrol_p.h @@ -115,11 +115,9 @@ public: bool find(const QString &exp, QTextDocument::FindFlags options = 0); - inline QString toPlainText() const - { return document()->toPlainText(); } + QString toPlainText() const; #ifndef QT_NO_TEXTHTMLPARSER - inline QString toHtml() const - { return document()->toHtml(); } + QString toHtml() const; #endif virtual void ensureCursorVisible(); |