diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-24 00:00:19 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-24 00:00:19 (GMT) |
| commit | 56fe1454fe08ec7cc258cbbd38486e721d088c99 (patch) | |
| tree | 597051d1f3b73595f48bcad5a5acb24026c6ba66 /src/declarative/graphicsitems/qmlgraphicstextedit.cpp | |
| parent | e26db74521e063a1513731eb14581d93a3d77481 (diff) | |
| parent | af4f30abb88d242d1e310914b53bc91b24e45a59 (diff) | |
| download | Qt-56fe1454fe08ec7cc258cbbd38486e721d088c99.zip Qt-56fe1454fe08ec7cc258cbbd38486e721d088c99.tar.gz Qt-56fe1454fe08ec7cc258cbbd38486e721d088c99.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
doc/src/declarative/advtutorial1.qdoc
src/declarative/qml/qmlmoduleplugin.cpp
src/declarative/util/qmlxmllistmodel.cpp
Diffstat (limited to 'src/declarative/graphicsitems/qmlgraphicstextedit.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicstextedit.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp index 3dadbe0..364751d 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp +++ b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp @@ -59,6 +59,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass TextEdit QmlGraphicsTextEdit + \since 4.7 \brief The TextEdit item allows you to add editable formatted text to a scene. It can display both plain and rich text. For example: |