summaryrefslogtreecommitdiffstats
path: root/examples
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 /examples
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 'examples')
-rw-r--r--examples/declarative/fillmode/fillmode.qml2
-rw-r--r--examples/declarative/fonts/fonts.qml10
-rw-r--r--examples/declarative/listview/recipes.qml6
-rw-r--r--examples/declarative/loader/Browser.qml2
-rw-r--r--examples/declarative/loader/Button.qml2
-rw-r--r--examples/declarative/minehunt/minehunt.qml2
-rw-r--r--examples/declarative/tutorials/helloworld/t1/tutorial1.qml2
-rw-r--r--examples/declarative/tutorials/helloworld/t2/tutorial2.qml2
-rw-r--r--examples/declarative/tutorials/helloworld/t3/tutorial3.qml2
-rw-r--r--examples/declarative/velocity/Day.qml4
-rw-r--r--examples/declarative/xmldata/yahoonews.qml2
11 files changed, 18 insertions, 18 deletions
diff --git a/examples/declarative/fillmode/fillmode.qml b/examples/declarative/fillmode/fillmode.qml
index f2a87c8..9e22885 100644
--- a/examples/declarative/fillmode/fillmode.qml
+++ b/examples/declarative/fillmode/fillmode.qml
@@ -28,7 +28,7 @@ Image {
}
Text {
id: Label
- font.size: 24
+ font.pointSize: 24
color: "blue"
style: "Outline"
styleColor: "white"
diff --git a/examples/declarative/fonts/fonts.qml b/examples/declarative/fonts/fonts.qml
index 9fd409a..578cffa 100644
--- a/examples/declarative/fonts/fonts.qml
+++ b/examples/declarative/fonts/fonts.qml
@@ -24,21 +24,21 @@ Rect {
color: Palette.windowText
width: parent.width; elide: "ElideRight"
font.family: "Times"
- font.size: 32
+ font.pointSize: 32
}
Text {
text: myText
color: Palette.windowText
width: parent.width; elide: "ElideRight"
font.family: FixedFont.name
- font.size: 32
+ font.pointSize: 32
}
Text {
text: myText
color: Palette.windowText
width: parent.width; elide: "ElideRight"
font.family: LocalFont.name
- font.size: 32
+ font.pointSize: 32
}
Text {
text: {
@@ -49,7 +49,7 @@ Rect {
color: Palette.windowText
width: parent.width; elide: "ElideRight"
font.family: WebFont.name
- font.size: 32
+ font.pointSize: 32
}
Text {
text: {
@@ -60,7 +60,7 @@ Rect {
color: Palette.windowText
width: parent.width; elide: "ElideRight"
font.family: WebFont2.name
- font.size: 32
+ font.pointSize: 32
}
}
}
diff --git a/examples/declarative/listview/recipes.qml b/examples/declarative/listview/recipes.qml
index 7abadd0..b2c17af 100644
--- a/examples/declarative/listview/recipes.qml
+++ b/examples/declarative/listview/recipes.qml
@@ -48,9 +48,9 @@ Rect {
VerticalPositioner {
height: recipePic.height; width: background.width-recipePic.width-20
spacing: 5
- Text { id: name; text: title; font.bold: true; font.size: 16 }
+ Text { id: name; text: title; font.bold: true; font.pointSize: 16 }
Text {
- text: "Ingredients"; font.size: 12; font.bold: true
+ text: "Ingredients"; font.pointSize: 12; font.bold: true
opacity: wrapper.detailsOpacity
}
Text {
@@ -67,7 +67,7 @@ Rect {
opacity: wrapper.detailsOpacity
Text {
id: methodTitle
- text: "Method"; font.size: 12; font.bold: true
+ text: "Method"; font.pointSize: 12; font.bold: true
anchors.top: parent.top
}
Flickable {
diff --git a/examples/declarative/loader/Browser.qml b/examples/declarative/loader/Browser.qml
index 96c2a76..1c849b8 100644
--- a/examples/declarative/loader/Browser.qml
+++ b/examples/declarative/loader/Browser.qml
@@ -36,7 +36,7 @@ Rect {
id: NameText
anchors.fill: parent; vAlign: "AlignVCenter"
text: fileName; anchors.leftMargin: 32
- font.size: 10
+ font.pointSize: 10
color: activePalette.windowText
}
MouseRegion {
diff --git a/examples/declarative/loader/Button.qml b/examples/declarative/loader/Button.qml
index 999e180..391a800 100644
--- a/examples/declarative/loader/Button.qml
+++ b/examples/declarative/loader/Button.qml
@@ -12,5 +12,5 @@ Rect {
radius: 4
color: "grey"
MouseRegion { anchors.fill: parent; onClicked: Container.clicked() }
- Text { id: Text; anchors.centerIn:parent; font.size: 10; text: parent.text }
+ Text { id: Text; anchors.centerIn:parent; font.pointSize: 10; text: parent.text }
}
diff --git a/examples/declarative/minehunt/minehunt.qml b/examples/declarative/minehunt/minehunt.qml
index 55cf3c2..b3bcaf3 100644
--- a/examples/declarative/minehunt/minehunt.qml
+++ b/examples/declarative/minehunt/minehunt.qml
@@ -148,7 +148,7 @@ Item {
y: 380
Text {
color: "white"
- font.size: 18
+ font.pointSize: 18
x: 20
y: 20
}
diff --git a/examples/declarative/tutorials/helloworld/t1/tutorial1.qml b/examples/declarative/tutorials/helloworld/t1/tutorial1.qml
index f067695..156655a 100644
--- a/examples/declarative/tutorials/helloworld/t1/tutorial1.qml
+++ b/examples/declarative/tutorials/helloworld/t1/tutorial1.qml
@@ -8,7 +8,7 @@ Rect {
Text {
id: HelloText
text: "Hello world!"
- font.size: 24
+ font.pointSize: 24
font.bold: true
y: 30
anchors.horizontalCenter: Page.horizontalCenter
diff --git a/examples/declarative/tutorials/helloworld/t2/tutorial2.qml b/examples/declarative/tutorials/helloworld/t2/tutorial2.qml
index efbdbf1..5619d04 100644
--- a/examples/declarative/tutorials/helloworld/t2/tutorial2.qml
+++ b/examples/declarative/tutorials/helloworld/t2/tutorial2.qml
@@ -8,7 +8,7 @@ Rect {
Text {
id: HelloText
text: "Hello world!"
- font.size: 24
+ font.pointSize: 24
font.bold: true
y: 30
anchors.horizontalCenter: Page.horizontalCenter
diff --git a/examples/declarative/tutorials/helloworld/t3/tutorial3.qml b/examples/declarative/tutorials/helloworld/t3/tutorial3.qml
index 3e93632..ca32709 100644
--- a/examples/declarative/tutorials/helloworld/t3/tutorial3.qml
+++ b/examples/declarative/tutorials/helloworld/t3/tutorial3.qml
@@ -8,7 +8,7 @@ Rect {
Text {
id: HelloText
text: "Hello world!"
- font.size: 24
+ font.pointSize: 24
font.bold: true
y: 30
anchors.horizontalCenter: Page.horizontalCenter
diff --git a/examples/declarative/velocity/Day.qml b/examples/declarative/velocity/Day.qml
index f7a5a47..59a31af 100644
--- a/examples/declarative/velocity/Day.qml
+++ b/examples/declarative/velocity/Day.qml
@@ -18,7 +18,7 @@ Rect {
x: 20
y: 20
height: 40
- font.size: 14
+ font.pointSize: 14
font.bold: true
width: 370
text: day
@@ -50,7 +50,7 @@ Rect {
TextEdit {
id: MyText
smooth: true
- font.size: 28
+ font.pointSize: 28
readOnly: false
x: -104
y: 36
diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml
index c7f0b08..156eb31 100644
--- a/examples/declarative/xmldata/yahoonews.qml
+++ b/examples/declarative/xmldata/yahoonews.qml
@@ -49,7 +49,7 @@ Rect {
text: '<a href=\'' + link + '\'>' + title + '</a>'
font.bold: true
font.family: "Helvetica"
- font.size: 14
+ font.pointSize: 14
onLinkActivated: { print('link clicked: ' + link) }
}
Text {