diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-06-30 17:14:30 (GMT) |
|---|---|---|
| committer | Timo Turunen <timo.p.turunen@nokia.com> | 2011-08-30 07:02:03 (GMT) |
| commit | 1730f02496011cd23241803d34136786348ddae2 (patch) | |
| tree | 4c831a06ff1df66560973a38c7179249c868d871 /src/declarative/graphicsitems/qdeclarativetext.cpp | |
| parent | f0fd0eacc4d4a0db8c8b1124a53edb767d07f9cf (diff) | |
| download | Qt-1730f02496011cd23241803d34136786348ddae2.zip Qt-1730f02496011cd23241803d34136786348ddae2.tar.gz Qt-1730f02496011cd23241803d34136786348ddae2.tar.bz2 | |
Doc: Standardized on QtQuick for \since declarations.
(cherry picked from commit 609dc22f719ecb8d48349fd56f84960bbf46d731)
Reapplied after bad v4.7.4 merge
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. |