summaryrefslogtreecommitdiffstats
path: root/examples/declarative
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-10-09 01:10:43 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-10-09 01:15:29 (GMT)
commitb957118a2d2f44cec5f1a0709da26a5c685cc344 (patch)
treeff6375ac4eee91bf6a8531ee817f74976377f4d5 /examples/declarative
parent931350a9cb24f30e6fd6c227dbdc40937d59a705 (diff)
downloadQt-b957118a2d2f44cec5f1a0709da26a5c685cc344.zip
Qt-b957118a2d2f44cec5f1a0709da26a5c685cc344.tar.gz
Qt-b957118a2d2f44cec5f1a0709da26a5c685cc344.tar.bz2
Fix example errors
Diffstat (limited to 'examples/declarative')
-rw-r--r--examples/declarative/layouts/Button.qml8
-rw-r--r--examples/declarative/webview/content/FieldText.qml2
-rw-r--r--examples/declarative/xmldata/yahoonews.qml2
3 files changed, 5 insertions, 7 deletions
diff --git a/examples/declarative/layouts/Button.qml b/examples/declarative/layouts/Button.qml
index 6c2fd8d..1fa0dee 100644
--- a/examples/declarative/layouts/Button.qml
+++ b/examples/declarative/layouts/Button.qml
@@ -1,16 +1,16 @@
import Qt 4.6
-Rectangle { border.color: "black"; color: "steelblue"; radius: 5; width: pix.width + text.width + 13; height: pix.height + 10; id: page
+Rectangle { border.color: "black"; color: "steelblue"; radius: 5; width: pix.width + textelement.width + 13; height: pix.height + 10; id: page
property string text
property string icon
signal clicked
Image { id: pix; x: 5; y:5; source: parent.icon}
- Text { id: text; text: page.text; color: "white"; x:pix.width+pix.x+3; anchors.verticalCenter: pix.verticalCenter;}
+ Text { id: textelement; text: page.text; color: "white"; x:pix.width+pix.x+3; anchors.verticalCenter: pix.verticalCenter;}
MouseRegion{ id:mr; anchors.fill: parent; onClicked: {parent.focus = true; page.clicked()}}
states:
State{ name:"pressed"; when:mr.pressed
- PropertyChanges {target:text; x: 5}
- PropertyChanges {target:pix; x:text.x+text.width + 3}
+ PropertyChanges {target:textelement; x: 5}
+ PropertyChanges {target:pix; x:textelement.x+textelement.width + 3}
}
transitions:
diff --git a/examples/declarative/webview/content/FieldText.qml b/examples/declarative/webview/content/FieldText.qml
index fe55185..2adfbbf 100644
--- a/examples/declarative/webview/content/FieldText.qml
+++ b/examples/declarative/webview/content/FieldText.qml
@@ -10,7 +10,6 @@ Item {
signal cancelled
signal startEdit
- resources: [
Script {
function edit() {
@@ -36,7 +35,6 @@ Item {
}
}
- ]
Image {
id: cancelIcon
diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml
index bad1d88..6d43f46 100644
--- a/examples/declarative/xmldata/yahoonews.qml
+++ b/examples/declarative/xmldata/yahoonews.qml
@@ -32,7 +32,7 @@ Rectangle {
height: wrapper.height + 10
MouseRegion {
anchors.fill: wrapper
- onPressed: { delegate.ListView.list.currentIndex = index; }
+ onPressed: { delegate.ListView.view.currentIndex = index; }
onClicked: { if (wrapper.state == 'Details') { wrapper.state = '';} else {wrapper.state = 'Details';} }
}
Rectangle {