diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-08-20 06:41:34 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-08-20 06:41:34 (GMT) |
| commit | fa66c623a7a7bd930bf7efc022a2de7501948d84 (patch) | |
| tree | 35d19a700c516ab45a42af0f8ccda6df8d3904f4 /src/declarative | |
| parent | f3ed6a6156c49ae6e17cd259e6e9b0bc1100f280 (diff) | |
| download | Qt-fa66c623a7a7bd930bf7efc022a2de7501948d84.zip Qt-fa66c623a7a7bd930bf7efc022a2de7501948d84.tar.gz Qt-fa66c623a7a7bd930bf7efc022a2de7501948d84.tar.bz2 | |
Add font doc to TextInput and TextEdit.
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/fx/qfxtext.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/fx/qfxtextedit.cpp | 7 | ||||
| -rw-r--r-- | src/declarative/fx/qfxtextinput.cpp | 7 |
3 files changed, 13 insertions, 3 deletions
diff --git a/src/declarative/fx/qfxtext.cpp b/src/declarative/fx/qfxtext.cpp index e310200..69768b3 100644 --- a/src/declarative/fx/qfxtext.cpp +++ b/src/declarative/fx/qfxtext.cpp @@ -128,7 +128,7 @@ QFxText::~QFxText() \qmlproperty bool Text::font.italic \qmlproperty bool Text::font.underline \qmlproperty real Text::font.pointSize - \qmlproperty real Text::font.pixelSize + \qmlproperty int Text::font.pixelSize Set the Text's font attributes. */ diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp index 3cab15d..eaceeeb 100644 --- a/src/declarative/fx/qfxtextedit.cpp +++ b/src/declarative/fx/qfxtextedit.cpp @@ -124,7 +124,12 @@ QString QFxTextEdit::text() const } /*! - \qmlproperty font TextEdit::font + \qmlproperty string TextEdit::font.family + \qmlproperty bool TextEdit::font.bold + \qmlproperty bool TextEdit::font.italic + \qmlproperty bool TextEdit::font.underline + \qmlproperty real TextEdit::font.pointSize + \qmlproperty int TextEdit::font.pixelSize Set the TextEdit's font attributes. */ diff --git a/src/declarative/fx/qfxtextinput.cpp b/src/declarative/fx/qfxtextinput.cpp index 252d5c8..b9b33ab 100644 --- a/src/declarative/fx/qfxtextinput.cpp +++ b/src/declarative/fx/qfxtextinput.cpp @@ -99,7 +99,12 @@ void QFxTextInput::setText(const QString &s) } /*! - \qmlproperty font TextInput::font + \qmlproperty string TextInput::font.family + \qmlproperty bool TextInput::font.bold + \qmlproperty bool TextInput::font.italic + \qmlproperty bool TextInput::font.underline + \qmlproperty real TextInput::font.pointSize + \qmlproperty int TextInput::font.pixelSize Set the TextInput's font attributes. */ |