diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-25 14:02:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-25 14:02:55 (GMT) |
| commit | 74b6123b41192fc7cfcfdea862e28a382f90e7d9 (patch) | |
| tree | adfb03afa091cbd1c70e301eb033171245122f2e | |
| parent | 6def795a602f24a402f7d90628499a39bd20a918 (diff) | |
| parent | ca03f39224fb64775ed7150685df96c6b5b83b23 (diff) | |
| download | Qt-74b6123b41192fc7cfcfdea862e28a382f90e7d9.zip Qt-74b6123b41192fc7cfcfdea862e28a382f90e7d9.tar.gz Qt-74b6123b41192fc7cfcfdea862e28a382f90e7d9.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
Fixed QML TextEdit docs
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextedit.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp index e2f6265..42ce404 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp @@ -271,7 +271,6 @@ void QDeclarativeTextEdit::setText(const QString &text) \o TextEdit.AutoText \o TextEdit.PlainText \o TextEdit.RichText - \o TextEdit.StyledText \endlist The default is TextEdit.AutoText. If the text format is TextEdit.AutoText the text edit |