diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2010-04-12 22:26:12 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2010-04-12 22:34:49 (GMT) |
| commit | ff0020481398e7c109973949260a42711c4cdcdc (patch) | |
| tree | 994fb4d84402ceb56a0795cae8fba499ef4a2f45 | |
| parent | 0a226e31605ae9c1843e23adbe6be393f6cd8cac (diff) | |
| download | Qt-ff0020481398e7c109973949260a42711c4cdcdc.zip Qt-ff0020481398e7c109973949260a42711c4cdcdc.tar.gz Qt-ff0020481398e7c109973949260a42711c4cdcdc.tar.bz2 | |
doc fixes
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetext.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp index f31f5aa..b65212b 100644 --- a/src/declarative/graphicsitems/qdeclarativetext.cpp +++ b/src/declarative/graphicsitems/qdeclarativetext.cpp @@ -275,7 +275,7 @@ void QDeclarativeText::setText(const QString &n) /*! \qmlproperty string Text::text - The text to display. Text supports both plain and rich text strings. + The text to display. Text supports both plain and rich text strings. The item will try to automatically determine whether the text should be treated as rich text. This determination is made using Qt::mightBeRichText(). @@ -322,14 +322,20 @@ QColor QDeclarativeText::color() const Set an additional text style. - Supported text styles are \c Normal, \c Outline, \c Raised and \c Sunken. + Supported text styles are: + \list + \o Normal - the default + \o Outline + \o Raised + \o Sunken + \endlist \qml Row { Text { font.pointSize: 24; text: "Normal" } - Text { font.pointSize: 24; text: "Raised"; style: Text.Raised; styleColor: "#AAAAAA" } - Text { font.pointSize: 24; text: "Outline"; style: Text.Outline; styleColor: "red" } - Text { font.pointSize: 24; text: "Sunken"; style: Text.Sunken; styleColor: "#AAAAAA" } + Text { font.pointSize: 24; text: "Raised"; style: Text.Raised; styleColor: "#AAAAAA" } + Text { font.pointSize: 24; text: "Outline";style: Text.Outline; styleColor: "red" } + Text { font.pointSize: 24; text: "Sunken"; style: Text.Sunken; styleColor: "#AAAAAA" } } \endqml @@ -371,6 +377,10 @@ void QDeclarativeText::setStyleColor(const QColor &color) \c styleColor is used as the outline color for outlined text, and as the shadow color for raised or sunken text. If no style has been set, it is not used at all. + + \qml + Text { font.pointSize: 18; text: "hello"; style: Text.Raised; styleColor: "gray" } + \endqml */ QColor QDeclarativeText::styleColor() const { |