Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

4 files changed, 19 insertions, 19 deletions

diff --git a/src/declarative/fx/qfxtext.cpp b/src/declarative/fx/qfxtext.cpp
index dcaaa54..e310200 100644
--- a/src/declarative/fx/qfxtext.cpp
+++ b/src/declarative/fx/qfxtext.cpp
@@ -62,7 +62,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Text,QFxText)
     It can display both plain and rich text. For example:
 
     \qml
-    Text { text: "Hello World!"; font.family: "Helvetica"; font.size: 24; color: "red" }
+    Text { text: "Hello World!"; font.family: "Helvetica"; font.pointSize: 24; color: "red" }
     Text { text: "<b>Hello</b> <i>World!</i>" }
     \endqml
 
@@ -90,7 +90,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Text,QFxText)
     It can display both plain and rich text. For example:
 
     \qml
-    Text { text: "Hello World!"; font.family: "Helvetica"; font.size: 24; color: "red" }
+    Text { text: "Hello World!"; font.family: "Helvetica"; font.pointSize: 24; color: "red" }
     Text { text: "<b>Hello</b> <i>World!</i>" }
     \endqml
 
@@ -126,11 +126,11 @@ QFxText::~QFxText()
     \qmlproperty string Text::font.family
     \qmlproperty bool Text::font.bold
     \qmlproperty bool Text::font.italic
-    \qmlproperty real Text::font.size
+    \qmlproperty bool Text::font.underline
+    \qmlproperty real Text::font.pointSize
+    \qmlproperty real Text::font.pixelSize
 
     Set the Text's font attributes.
-
-    \note \c font.size sets the font's point size (not pixel size).
 */
 QFont QFxText::font() const
 {
@@ -230,10 +230,10 @@ QColor QFxText::color() const
 
     \qml
     HorizontalPositioner {
-        Text { font.size: 24; text: "Normal" }
-        Text { font.size: 24; text: "Raised";  style: "Raised";  styleColor: "#AAAAAA" }
-        Text { font.size: 24; text: "Outline"; style: "Outline"; styleColor: "red" }
-        Text { font.size: 24; text: "Sunken";  style: "Sunken";  styleColor: "#AAAAAA" }
+        Text { font.pointSize: 24; text: "Normal" }
+        Text { font.pointSize: 24; text: "Raised";  style: "Raised";  styleColor: "#AAAAAA" }
+        Text { font.pointSize: 24; text: "Outline"; style: "Outline"; styleColor: "red" }
+        Text { font.pointSize: 24; text: "Sunken";  style: "Sunken";  styleColor: "#AAAAAA" }
     }
     \endqml
 
@@ -365,16 +365,16 @@ void QFxText::setWrap(bool w)
     \qml
 VerticalPositioner {
     TextEdit {
-        font.size: 24
+        font.pointSize: 24
         text: "<b>Hello</b> <i>World!</i>"
     }
     TextEdit {
-        font.size: 24
+        font.pointSize: 24
         textFormat: "RichText"
         text: "<b>Hello</b> <i>World!</i>"
     }
     TextEdit {
-        font.size: 24
+        font.pointSize: 24
         textFormat: "PlainText"
         text: "<b>Hello</b> <i>World!</i>"
     }
diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp
index f7f5f0a..3cab15d 100644
--- a/src/declarative/fx/qfxtextedit.cpp
+++ b/src/declarative/fx/qfxtextedit.cpp
@@ -67,7 +67,7 @@ TextEdit {
     text: "<b>Hello</b> <i>World!</i>"
     focus: true
     font.family: "Helvetica"
-    font.size: 20
+    font.pointSize: 20
     color: "blue"
     width: 240
 }
@@ -126,7 +126,7 @@ QString QFxTextEdit::text() const
 /*!
     \qmlproperty font TextEdit::font
 
-    Set the TextEdit's font attributes.  \c font.size sets the font's point size.
+    Set the TextEdit's font attributes.
 */
 
 /*!
@@ -169,16 +169,16 @@ void QFxTextEdit::setText(const QString &text)
     \qml
 VerticalPositioner {
     TextEdit {
-        font.size: 24
+        font.pointSize: 24
         text: "<b>Hello</b> <i>World!</i>"
     }
     TextEdit {
-        font.size: 24
+        font.pointSize: 24
         textFormat: "RichText"
         text: "<b>Hello</b> <i>World!</i>"
     }
     TextEdit {
-        font.size: 24
+        font.pointSize: 24
         textFormat: "PlainText"
         text: "<b>Hello</b> <i>World!</i>"
     }
diff --git a/src/declarative/fx/qfxtextinput.cpp b/src/declarative/fx/qfxtextinput.cpp
index 164739f..252d5c8 100644
--- a/src/declarative/fx/qfxtextinput.cpp
+++ b/src/declarative/fx/qfxtextinput.cpp
@@ -101,7 +101,7 @@ void QFxTextInput::setText(const QString &s)
 /*!
     \qmlproperty font TextInput::font
 
-    Set the TextInput's font attributes.  \c font.size sets the font's point size.
+    Set the TextInput's font attributes.
 */
 QFont QFxTextInput::font() const
 {
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index e04c876..afc8698 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -1449,7 +1449,7 @@ bool QmlCompiler::buildAttachedProperty(QmlParser::Property *prop,
 
 // Build "grouped" properties. In this example:
 // Text {
-//     font.size: 12
+//     font.pointSize: 12
 //     font.family: "Helvetica"
 // }
 // font is a nested property.  size and family are not.