diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-16 18:08:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-16 18:08:19 (GMT) |
| commit | 82440843435b8bf02391fae1c9df6f081a945a65 (patch) | |
| tree | 560873dbe432b3a55d1cc4ff8c47388e9498ff8d /src/declarative/graphicsitems/qdeclarativetextedit.cpp | |
| parent | 6ddda99db20203917229e399c4b8d333a119c3d6 (diff) | |
| parent | 5b47a913473802d377ec303b425eb1ad0496f843 (diff) | |
| download | Qt-82440843435b8bf02391fae1c9df6f081a945a65.zip Qt-82440843435b8bf02391fae1c9df6f081a945a65.tar.gz Qt-82440843435b8bf02391fae1c9df6f081a945a65.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Translate bughowto.qdoc into zh_CN.
diagramscene example: fix leak and crashes.
qdoc: Reorganized the QML elements table to be a dictionary...
qgrayraster: Speed up rendering of small cubic splines.
Fix compilation: QT_NO_LINEEDIT
Doc: Removed invalid entities in documentation.
Doc: Fixes to Qt Quick documentation.
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextedit.cpp')
| -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 8117676..b8e8726 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp @@ -61,6 +61,7 @@ QT_BEGIN_NAMESPACE /*! \qmlclass TextEdit QDeclarativeTextEdit + \ingroup qml-basic-visual-elements \since 4.7 \brief The TextEdit item displays multiple lines of editable formatted text. \inherits Item |