summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/declarative/fx/qfxtext.cpp2
-rw-r--r--src/declarative/fx/qfxtextedit.cpp7
-rw-r--r--src/declarative/fx/qfxtextinput.cpp7
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.
*/