diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-01 11:52:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-01 11:52:32 (GMT) |
| commit | 89c6b83ee22ceb009c26c826cc4158d179312434 (patch) | |
| tree | fdd6e47a9e0f8a83f65465999d0145cf7aba7b60 /src/declarative/graphicsitems/qdeclarativetext.cpp | |
| parent | fdc1359a81b983a3e4f138d11ce44f07cf38099d (diff) | |
| parent | 86608d537eabc3cf7e1d1ddd1d0a2f90ccc2de2a (diff) | |
| download | Qt-89c6b83ee22ceb009c26c826cc4158d179312434.zip Qt-89c6b83ee22ceb009c26c826cc4158d179312434.tar.gz Qt-89c6b83ee22ceb009c26c826cc4158d179312434.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
Doc: Clarified the range of return values from QLineF::angle().
Doc: Fixed \since declarations.
Doc: Standardized on QtQuick for \since declarations.
Doc: Removed whitespace.
Modified \since command behavior slightly to handle project and version.
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetext.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetext.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp index 91c12d2..6d1b15d 100644 --- a/src/declarative/graphicsitems/qdeclarativetext.cpp +++ b/src/declarative/graphicsitems/qdeclarativetext.cpp @@ -1213,7 +1213,7 @@ void QDeclarativeText::setWrapMode(WrapMode mode) /*! \qmlproperty int Text::lineCount - \since Quick 1.1 + \since QtQuick 1.1 Returns the number of lines visible in the text item. @@ -1229,7 +1229,7 @@ int QDeclarativeText::lineCount() const /*! \qmlproperty bool Text::truncated - \since Quick 1.1 + \since QtQuick 1.1 Returns true if the text has been truncated due to \l maximumLineCount or \l elide. @@ -1246,7 +1246,7 @@ bool QDeclarativeText::truncated() const /*! \qmlproperty int Text::maximumLineCount - \since Quick 1.1 + \since QtQuick 1.1 Set this property to limit the number of lines that the text item will show. If elide is set to Text.ElideRight, the text will be elided appropriately. @@ -1480,7 +1480,7 @@ qreal QDeclarativeText::paintedHeight() const /*! \qmlproperty real Text::lineHeight - \since Quick 1.1 + \since QtQuick 1.1 Sets the line height for the text. The value can be in pixels or a multiplier depending on lineHeightMode. |