diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-06-30 05:17:48 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-06-30 05:17:48 (GMT) |
| commit | 3fb8eede9ee01592542fc1c86b2848db1ce426fb (patch) | |
| tree | 7a231ad952933d5cff09fc2bb89fe7ed08587fad /src/declarative/graphicsitems/qdeclarativetext.cpp | |
| parent | 5f5c234f7ca57ca1db7b30d358e6c63bf4643c7b (diff) | |
| parent | 08c422315d52a9377ebf0912adbe4d17370173af (diff) | |
| download | Qt-3fb8eede9ee01592542fc1c86b2848db1ce426fb.zip Qt-3fb8eede9ee01592542fc1c86b2848db1ce426fb.tar.gz Qt-3fb8eede9ee01592542fc1c86b2848db1ce426fb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetext.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetext.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp index e97d362..0bd9a53 100644 --- a/src/declarative/graphicsitems/qdeclarativetext.cpp +++ b/src/declarative/graphicsitems/qdeclarativetext.cpp @@ -136,6 +136,8 @@ QSet<QUrl> QTextDocumentWithImageResources::errors; HTML img tags that load remote images, the text is reloaded. Text provides read-only text. For editable text, see \l TextEdit. + + \sa {declarative/text/fonts}{Fonts example} */ /*! |