summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2011-01-28 04:55:25 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2011-01-28 05:00:25 (GMT)
commit92488ca7e538e6bcf87d5cea4a78c39bb26346b7 (patch)
tree35e1ee6f472c526a9bc4a7d110bfe35161dc28ab /src/declarative
parent7c1ab9b6a8e1b3d64c08a4f5067448884b068945 (diff)
downloadQt-92488ca7e538e6bcf87d5cea4a78c39bb26346b7.zip
Qt-92488ca7e538e6bcf87d5cea4a78c39bb26346b7.tar.gz
Qt-92488ca7e538e6bcf87d5cea4a78c39bb26346b7.tar.bz2
Doc fix for lineHeight.
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/graphicsitems/qdeclarativetext.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index fb1ae06..54b4c3a 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -1433,6 +1433,8 @@ qreal QDeclarativeText::paintedHeight() const
Sets the line height for the text.
The value can be in pixels or a multiplier depending on lineHeightMode.
+ The default value is a multiplier of 1.0.
+ The line height must be a positive value.
*/
qreal QDeclarativeText::lineHeight() const
{
@@ -1453,7 +1455,7 @@ void QDeclarativeText::setLineHeight(qreal lineHeight)
}
/*!
- \qmlproperty real Text::lineHeightMode
+ \qmlproperty enumeration Text::lineHeightMode
This property determines how the line height is specified.
The possible values are: