diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-09 06:05:41 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-09 06:05:41 (GMT) |
| commit | c7ff857e0e93ca7dd555daf59e7508ee244bd876 (patch) | |
| tree | 6d3c453ddccf6ea89dd27be3573509a04d1e1981 | |
| parent | 75581e3330916f756462ff6924abf2c62c0d228e (diff) | |
| download | Qt-c7ff857e0e93ca7dd555daf59e7508ee244bd876.zip Qt-c7ff857e0e93ca7dd555daf59e7508ee244bd876.tar.gz Qt-c7ff857e0e93ca7dd555daf59e7508ee244bd876.tar.bz2 | |
Small doc fix.
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetext.cpp | 10 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextedit.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp index 1730ee4..69e3543 100644 --- a/src/declarative/graphicsitems/qdeclarativetext.cpp +++ b/src/declarative/graphicsitems/qdeclarativetext.cpp @@ -398,18 +398,18 @@ void QDeclarativeText::setWrap(bool w) \o \qml Column { - TextEdit { + Text { font.pointSize: 24 text: "<b>Hello</b> <i>World!</i>" } - TextEdit { + Text { font.pointSize: 24 - textFormat: "RichText" + textFormat: Text.RichText text: "<b>Hello</b> <i>World!</i>" } - TextEdit { + Text { font.pointSize: 24 - textFormat: "PlainText" + textFormat: Text.PlainText text: "<b>Hello</b> <i>World!</i>" } } diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp index 6f1f6ac..25d7e2a 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp @@ -171,12 +171,12 @@ Column { } TextEdit { font.pointSize: 24 - textFormat: "RichText" + textFormat: TextEdit.RichText text: "<b>Hello</b> <i>World!</i>" } TextEdit { font.pointSize: 24 - textFormat: "PlainText" + textFormat: TextEdit.PlainText text: "<b>Hello</b> <i>World!</i>" } } |