Get rid of QmlFont and use the QFont value type instead.

7 files changed, 9 insertions, 9 deletions

diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml
index 42e1422..f766a30 100644
--- a/demos/declarative/calculator/calculator.qml
+++ b/demos/declarative/calculator/calculator.qml
@@ -17,7 +17,7 @@ Rect {
 
             Text {
                 id: CurNum
-                font.bold: true; font.size: 16
+                font.bold: true; font.pointSize: 16
                 color: Palette.text
                 anchors.right: Container.right
                 anchors.rightMargin: 5
@@ -27,7 +27,7 @@ Rect {
             Text {
                 id: CurrentOperation
                 color: Palette.text
-                font.bold: true; font.size: 16
+                font.bold: true; font.pointSize: 16
                 anchors.left: Container.left
                 anchors.leftMargin: 5
                 anchors.verticalCenter: Container.verticalCenter
diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/demos/declarative/flickr/content/ImageDetails.qml
index 0182d48..09d8f03 100644
--- a/demos/declarative/flickr/content/ImageDetails.qml
+++ b/demos/declarative/flickr/content/ImageDetails.qml
@@ -44,7 +44,7 @@ Flipable {
         }
 
         Text { id: TitleText; style: "Raised"; styleColor: "black"; color: "white"; elide: "ElideRight"
-               x: 220; y: 30; width: parent.width - 240; text: Container.photoTitle; font.size: 22 }
+               x: 220; y: 30; width: parent.width - 240; text: Container.photoTitle; font.pointSize: 22 }
 
         LikeOMeter { x: 40; y: 250; rating: Container.rating }
 
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml
index 8e1e3e8..a8d18fb 100644
--- a/demos/declarative/flickr/flickr.qml
+++ b/demos/declarative/flickr/flickr.qml
@@ -206,6 +206,6 @@ Item {
         id: CategoryText;  anchors.horizontalCenter: parent.horizontalCenter; y: 15;
         text: "Flickr - " +
             (FeedModel.tags=="" ? "Uploads from everyone" : "Recent Uploads tagged " + FeedModel.tags)
-        font.size: 20; font.bold: true; color: "white"; style: "Raised"; styleColor: "black"
+        font.pointSize: 20; font.bold: true; color: "white"; style: "Raised"; styleColor: "black"
     }
 }
diff --git a/demos/declarative/flickr/flickr2.qml b/demos/declarative/flickr/flickr2.qml
index f3b4244..5350a36 100644
--- a/demos/declarative/flickr/flickr2.qml
+++ b/demos/declarative/flickr/flickr2.qml
@@ -256,6 +256,6 @@ Item {
         id: CategoryText;  anchors.horizontalCenter: parent.horizontalCenter; y: 15;
         text: "Flickr - " +
             (FeedModel.tags=="" ? "Uploads from everyone" : "Recent Uploads tagged " + FeedModel.tags)
-        font.size: 16; font.bold: true; color: "white"; style: "Raised"; styleColor: "black"
+        font.pointSize: 16; font.bold: true; color: "white"; style: "Raised"; styleColor: "black"
     }
 }
diff --git a/demos/declarative/samegame/SameGame.qml b/demos/declarative/samegame/SameGame.qml
index e74646d..42c313c 100644
--- a/demos/declarative/samegame/SameGame.qml
+++ b/demos/declarative/samegame/SameGame.qml
@@ -28,7 +28,7 @@ Rect {
         anchors.top: gameCanvas.bottom; anchors.topMargin: 4; anchors.left: gameCanvas.left;
     }
     Text { 
-        text: "Score: " + gameCanvas.score; width:100; font.size:14 
+        text: "Score: " + gameCanvas.score; width:100; font.pointSize:14 
         anchors.top: gameCanvas.bottom; anchors.topMargin: 4; anchors.right: gameCanvas.right;
     }
 }
diff --git a/demos/declarative/samegame/content/Button.qml b/demos/declarative/samegame/content/Button.qml
index c7a49f1..e3d0d30 100644
--- a/demos/declarative/samegame/content/Button.qml
+++ b/demos/declarative/samegame/content/Button.qml
@@ -13,6 +13,6 @@ Rect {
     MouseRegion { id:mr; anchors.fill: parent; onClicked: page.clicked() }
     Text {
         id: txtItem; text: page.text; anchors.centerIn: page; color: activePalette.buttonText 
-        font.size: 14;
+        font.pointSize: 14;
     }
 }
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index 73fedae..f57b7be 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -87,7 +87,7 @@ Item {
                     style: "Raised"
 
                     font.family: "Helvetica"
-                    font.size: 10
+                    font.pointSize: 10
                     font.bold: true
 
                     anchors.left: Header.left
@@ -136,7 +136,7 @@ Item {
                             /*<<<<<<< HEAD:demos/declarative/webbrowser/webbrowser.qml
                             text: MyWebView.url == '' ? ' ' : MyWebView.url
                             wrap: false
-                            font.size: 11
+                            font.pointSize: 11
                             color: "#555555"
                             focusOnPress: true
                             =======*/