summaryrefslogtreecommitdiffstats
path: root/demos/declarative/samegame
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-08-14 02:56:13 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-08-14 02:56:13 (GMT)
commitc7aef9c3a3a9c4b2fcebb9f55ae11fc0b590a9ed (patch)
treee2618da2b6ce8c4d3ceeecfe66d7fb133068be01 /demos/declarative/samegame
parentda56f50eb640823e2d48c1308c09626a428a50f5 (diff)
downloadQt-c7aef9c3a3a9c4b2fcebb9f55ae11fc0b590a9ed.zip
Qt-c7aef9c3a3a9c4b2fcebb9f55ae11fc0b590a9ed.tar.gz
Qt-c7aef9c3a3a9c4b2fcebb9f55ae11fc0b590a9ed.tar.bz2
Get rid of QmlFont and use the QFont value type instead.
Diffstat (limited to 'demos/declarative/samegame')
-rw-r--r--demos/declarative/samegame/SameGame.qml2
-rw-r--r--demos/declarative/samegame/content/Button.qml2
2 files changed, 2 insertions, 2 deletions
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;
}
}