Merge v5.1.0 releasebaserock/morph

3 files changed, 9 insertions, 9 deletions

diff --git a/examples/quick/controls/touch/content/ButtonPage.qml b/examples/quick/controls/touch/content/ButtonPage.qml
index 635ce3b9..f431a52e 100644
--- a/examples/quick/controls/touch/content/ButtonPage.qml
+++ b/examples/quick/controls/touch/content/ButtonPage.qml
@@ -86,7 +86,7 @@ Item {
             anchors.margins: 20
             style: touchStyle
             text: "Dont press me"
-            onClicked: if (pageStack) pageStack.pop()
+            onClicked: if (stackView) stackView.pop()
         }
 
     }
diff --git a/examples/quick/controls/touch/content/TabBarPage.qml b/examples/quick/controls/touch/content/TabBarPage.qml
index c96314be..7651a3c1 100644
--- a/examples/quick/controls/touch/content/TabBarPage.qml
+++ b/examples/quick/controls/touch/content/TabBarPage.qml
@@ -80,11 +80,11 @@ Item {
                     anchors.fill: parent
                     border.bottom: 8
                     border.top: 8
-                    source: tab.selected ? "../images/tab_selected.png":"../images/tabs_standard.png"
+                    source: styleData.selected ? "../images/tab_selected.png":"../images/tabs_standard.png"
                     Text {
                         anchors.centerIn: parent
                         color: "white"
-                        text: tab.title.toUpperCase()
+                        text: styleData.title.toUpperCase()
                         font.pixelSize: 16
                     }
                     Rectangle {
diff --git a/examples/quick/controls/touch/main.qml b/examples/quick/controls/touch/main.qml
index 3058a0d3..9f93cb78 100644
--- a/examples/quick/controls/touch/main.qml
+++ b/examples/quick/controls/touch/main.qml
@@ -54,8 +54,8 @@ ApplicationWindow {
     // Implements back key navigation
     Keys.onReleased: {
         if (event.key === Qt.Key_Back) {
-            if (pageStack.depth > 1) {
-                pageStack.pop();
+            if (stackView.depth > 1) {
+                stackView.pop();
                 event.accepted = true;
             } else { Qt.quit(); }
         }
@@ -72,7 +72,7 @@ ApplicationWindow {
             width: opacity ? 60 : 0
             anchors.left: parent.left
             anchors.leftMargin: 20
-            opacity: pageStack.depth > 1 ? 1 : 0
+            opacity: stackView.depth > 1 ? 1 : 0
             anchors.verticalCenter: parent.verticalCenter
             antialiasing: true
             height: 60
@@ -87,7 +87,7 @@ ApplicationWindow {
                 id: backmouse
                 anchors.fill: parent
                 anchors.margins: -10
-                onClicked: pageStack.pop()
+                onClicked: stackView.pop()
             }
         }
 
@@ -126,7 +126,7 @@ ApplicationWindow {
     }
 
     StackView {
-        id: pageStack
+        id: stackView
         anchors.fill: parent
 
         initialItem: Item {
@@ -137,7 +137,7 @@ ApplicationWindow {
                 anchors.fill: parent
                 delegate: AndroidDelegate {
                     text: title
-                    onClicked: pageStack.push(Qt.resolvedUrl(page))
+                    onClicked: stackView.push(Qt.resolvedUrl(page))
                 }
             }
         }