aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2020-02-25 12:16:39 +0100
committerQt Cherry-pick Bot <cherrypickbot@codereview.qt-project.org>2020-07-30 13:12:07 +0000
commitb6dc9d05210a627a25f1ef05397e27a67c7f2f7c (patch)
tree8281b4c63b48f542528b19ae071fde15a4db3adc /examples
parent68244a85550efb1d0991375a7cf1f032e1ac5709 (diff)
Remove bindings to parent in delegates
Until we've decided whether to a) document that properties of parent should not be bound to in delegates or b) fix the warning that results from doing so after 8c72e634b3b0eacbfdee883bfc34994d3c19ed77, we can pre-emptively clean up a few places where it happens. Task-number: QTBUG-81976 Task-number: QTBUG-82393 Task-number: QTBUG-82989 Change-Id: I1e610613f6016ec1b9cf9ca33cdfb15d384731a8 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 456d26e97ec7745fdbd1afaaaa6c1dc217eca060) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples')
-rw-r--r--examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml3
-rw-r--r--examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml2
-rw-r--r--examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml2
-rw-r--r--examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc2
-rw-r--r--examples/quickcontrols2/gallery/gallery.qml2
-rw-r--r--examples/quickcontrols2/gallery/pages/DelegatePage.qml1
-rw-r--r--examples/quickcontrols2/imagine/automotive/qml/automotive.qml3
-rw-r--r--examples/quickcontrols2/imagine/musicplayer/musicplayer.qml3
-rw-r--r--examples/quickcontrols2/sidepanel/sidepanel.qml2
-rw-r--r--examples/quickcontrols2/swipetoremove/swipetoremove.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml2
11 files changed, 13 insertions, 11 deletions
diff --git a/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml b/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml
index 90a846ac..94942191 100644
--- a/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml
@@ -78,6 +78,7 @@ Page {
anchors.fill: parent
ListView {
+ id: listView
Layout.fillWidth: true
Layout.fillHeight: true
Layout.margins: pane.leftPadding + messageField.leftPadding
@@ -89,7 +90,7 @@ Page {
delegate: Row {
readonly property bool sentByMe: index % 2 == 0
- anchors.right: sentByMe ? parent.right : undefined
+ anchors.right: sentByMe ? listView.contentItem.right : undefined
spacing: 6
Rectangle {
diff --git a/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml b/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml
index 6684c233..d616fa38 100644
--- a/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml
@@ -92,7 +92,7 @@ Page {
recipient: inConversationWith
}
delegate: Column {
- anchors.right: sentByMe ? parent.right : undefined
+ anchors.right: sentByMe ? listView.contentItem.right : undefined
spacing: 6
readonly property bool sentByMe: model.recipient !== "Me"
diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml
index 790f9ee9..31238454 100644
--- a/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml
@@ -92,7 +92,7 @@ Page {
recipient: inConversationWith
}
delegate: Column {
- anchors.right: sentByMe ? parent.right : undefined
+ anchors.right: sentByMe ? listView.contentItem.right : undefined
spacing: 6
readonly property bool sentByMe: model.recipient !== "Me"
diff --git a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
index 49e98068..bc0ca846 100644
--- a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
+++ b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
@@ -490,7 +490,7 @@ we distinguish between different authors in three ways:
\list
\li Messages sent by the user are aligned to the right side of the screen
-by setting \c anchors.right to \c parent.right.
+by setting \c anchors.right to \c listView.contentItem.right.
\li By setting the \c visible property of the avatar (which is simply a
Rectangle for now) based on \c sentByMe, we only show it if the message was
diff --git a/examples/quickcontrols2/gallery/gallery.qml b/examples/quickcontrols2/gallery/gallery.qml
index 44090b8a..504a36c7 100644
--- a/examples/quickcontrols2/gallery/gallery.qml
+++ b/examples/quickcontrols2/gallery/gallery.qml
@@ -173,7 +173,7 @@ ApplicationWindow {
anchors.fill: parent
delegate: ItemDelegate {
- width: parent.width
+ width: listView.width
text: model.title
highlighted: ListView.isCurrentItem
onClicked: {
diff --git a/examples/quickcontrols2/gallery/pages/DelegatePage.qml b/examples/quickcontrols2/gallery/pages/DelegatePage.qml
index 30f07be1..20ceaa6b 100644
--- a/examples/quickcontrols2/gallery/pages/DelegatePage.qml
+++ b/examples/quickcontrols2/gallery/pages/DelegatePage.qml
@@ -110,7 +110,6 @@ Pane {
CheckDelegate {
text: labelText
- width: parent.width
}
}
diff --git a/examples/quickcontrols2/imagine/automotive/qml/automotive.qml b/examples/quickcontrols2/imagine/automotive/qml/automotive.qml
index 91e3bf7c..2c001db2 100644
--- a/examples/quickcontrols2/imagine/automotive/qml/automotive.qml
+++ b/examples/quickcontrols2/imagine/automotive/qml/automotive.qml
@@ -269,6 +269,7 @@ ApplicationWindow {
Layout.preferredHeight: 128
ListView {
+ id: stationListView
clip: true
anchors.fill: parent
@@ -296,7 +297,7 @@ ApplicationWindow {
}
delegate: ItemDelegate {
id: stationDelegate
- width: parent.width
+ width: stationListView.width
height: 22
text: model.name
font.pixelSize: fontSizeExtraSmall
diff --git a/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml b/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml
index de4fd281..28ed5861 100644
--- a/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml
+++ b/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml
@@ -431,6 +431,7 @@ ApplicationWindow {
Layout.fillHeight: true
ListView {
+ id: filesListView
clip: true
anchors.fill: parent
model: ListModel {
@@ -446,7 +447,7 @@ ApplicationWindow {
}
delegate: ItemDelegate {
text: model.author + " - " + model.album + " - " + model.track
- width: parent.width
+ width: filesListView.width
}
ScrollBar.vertical: ScrollBar {
diff --git a/examples/quickcontrols2/sidepanel/sidepanel.qml b/examples/quickcontrols2/sidepanel/sidepanel.qml
index e2473ac9..a0c69fb2 100644
--- a/examples/quickcontrols2/sidepanel/sidepanel.qml
+++ b/examples/quickcontrols2/sidepanel/sidepanel.qml
@@ -132,7 +132,7 @@ ApplicationWindow {
delegate: ItemDelegate {
text: qsTr("Title %1").arg(index + 1)
- width: parent.width
+ width: listView.width
}
ScrollIndicator.vertical: ScrollIndicator { }
diff --git a/examples/quickcontrols2/swipetoremove/swipetoremove.qml b/examples/quickcontrols2/swipetoremove/swipetoremove.qml
index b4b0d588..65127a1a 100644
--- a/examples/quickcontrols2/swipetoremove/swipetoremove.qml
+++ b/examples/quickcontrols2/swipetoremove/swipetoremove.qml
@@ -67,7 +67,7 @@ ApplicationWindow {
id: delegate
text: modelData
- width: parent.width
+ width: listView.width
//! [delegate]
swipe.right: Rectangle {
diff --git a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml
index b3102771..a8e99345 100644
--- a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml
+++ b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml
@@ -77,7 +77,7 @@ ListView {
delegate: Item {
height: missedCallsView.height
width: missedCallsView.width / 2
- anchors.left: parent.horizontalCenter
+ anchors.left: missedCallsView.contentItem.horizontalCenter
Column {
spacing: 15