summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-09-02 01:37:35 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-09-02 01:37:35 (GMT)
commit8eed5aa528f668acfa1831432f97f7333c7d9e71 (patch)
treeba995952da3a2cf02057fffd1e401c40c350891e /examples
parent4e5086762521828e11c1e33f062b45c16cc109f8 (diff)
downloadQt-8eed5aa528f668acfa1831432f97f7333c7d9e71.zip
Qt-8eed5aa528f668acfa1831432f97f7333c7d9e71.tar.gz
Qt-8eed5aa528f668acfa1831432f97f7333c7d9e71.tar.bz2
Flickable locked property changed to interactive.
Note that the meaning of the property has been reversed.
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/listview/recipes.qml6
-rw-r--r--examples/declarative/tutorials/contacts/3_Collections/2/ContactView.qml2
-rw-r--r--examples/declarative/tutorials/contacts/3_Collections/3/ContactView.qml2
3 files changed, 5 insertions, 5 deletions
diff --git a/examples/declarative/listview/recipes.qml b/examples/declarative/listview/recipes.qml
index eac8bb5..2148ef4 100644
--- a/examples/declarative/listview/recipes.qml
+++ b/examples/declarative/listview/recipes.qml
@@ -104,9 +104,9 @@ Rectangle {
// Make the detailed view fill the entire list area
PropertyChanges { target: wrapper; height: List.height }
// Move the list so that this item is at the top.
- PropertyChanges { target: wrapper.ListView.view; explicit: true; yPosition: wrapper.y }
+ PropertyChanges { target: wrapper.ListView.view; explicit: true; viewportY: wrapper.y }
// Disallow flicking while we're in detailed view
- PropertyChanges { target: wrapper.ListView.view; locked: 1 }
+ PropertyChanges { target: wrapper.ListView.view; interactive: false }
}
]
transitions: [
@@ -115,7 +115,7 @@ Rectangle {
ParallelAnimation {
ColorAnimation { property: "color"; duration: 500 }
NumberAnimation {
- duration: 300; properties: "detailsOpacity,x,yPosition,height,width"
+ duration: 300; properties: "detailsOpacity,x,viewportY,height,width"
}
}
}
diff --git a/examples/declarative/tutorials/contacts/3_Collections/2/ContactView.qml b/examples/declarative/tutorials/contacts/3_Collections/2/ContactView.qml
index d16e3ca..8ee51c3 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/2/ContactView.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/2/ContactView.qml
@@ -84,7 +84,7 @@ Item {
}
PropertyChanges {
target: contactListView
- locked: 1
+ interactive: 0
}
PropertyChanges {
target: label
diff --git a/examples/declarative/tutorials/contacts/3_Collections/3/ContactView.qml b/examples/declarative/tutorials/contacts/3_Collections/3/ContactView.qml
index bf73367..76dc3e2 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/3/ContactView.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/3/ContactView.qml
@@ -102,7 +102,7 @@ Item {
}
PropertyChanges {
target: contactListView
- locked: 1
+ interactive: 0
}
PropertyChanges {
target: label