diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-10-12 05:52:19 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-10-12 05:52:19 (GMT) |
| commit | 79c8df2e2e45e2eafa0789da0a84104b604fa0be (patch) | |
| tree | 72327aeef55ecc800f492d8f6b51d41ee4b47011 /src | |
| parent | 2dfca66add98481348d67ccdcca7e3bf7b890e0c (diff) | |
| parent | e4dbf0c82b46e7a32e21185c8f633506229be944 (diff) | |
| download | Qt-79c8df2e2e45e2eafa0789da0a84104b604fa0be.zip Qt-79c8df2e2e45e2eafa0789da0a84104b604fa0be.tar.gz Qt-79c8df2e2e45e2eafa0789da0a84104b604fa0be.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextedit.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp index 6f5608a..e05f4e4 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp @@ -319,6 +319,7 @@ void QDeclarativeTextEdit::setTextFormat(TextFormat format) updateSize(); } d->format = format; + d->control->setAcceptRichText(d->format != PlainText); emit textFormatChanged(d->format); } |