summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--features/Login.qml2
-rw-r--r--features/Onboarding.qml2
-rw-r--r--main.qml12
3 files changed, 8 insertions, 8 deletions
diff --git a/features/Login.qml b/features/Login.qml
index 9913ecc..67239cb 100644
--- a/features/Login.qml
+++ b/features/Login.qml
@@ -6,7 +6,7 @@ import QtQuick.Layouts 1.12
LoginForm {
continueButton.onClicked: {
- stackView.push("EnterPasswordForm.ui.qml")
+ contentView.push("EnterPasswordForm.ui.qml")
}
}
diff --git a/features/Onboarding.qml b/features/Onboarding.qml
index bfda1e5..b4239f4 100644
--- a/features/Onboarding.qml
+++ b/features/Onboarding.qml
@@ -2,5 +2,5 @@ import QtQuick 2.4
OnboardingForm {
objectName: "onboarding"
- loginButton.onClicked: stackView.push("Login.qml")
+ loginButton.onClicked: contentView.push("Login.qml")
}
diff --git a/main.qml b/main.qml
index 01afedd..b4632e1 100644
--- a/main.qml
+++ b/main.qml
@@ -25,8 +25,8 @@ ApplicationWindow {
icon.source: "components/icons/menu-24px.svg"
highlighted: true
onClicked: {
- if (stackView.depth > 1) {
- stackView.pop()
+ if (contentView.depth > 1) {
+ contentView.pop()
} else {
drawer.open()
}
@@ -34,7 +34,7 @@ ApplicationWindow {
}
Label {
- text: stackView.currentItem.title
+ text: contentView.currentItem.title
font.family: "Work Sans"
font.weight: Font.Medium
font.pointSize: 20
@@ -60,7 +60,7 @@ ApplicationWindow {
text: qsTr("Page 1")
width: parent.width
onClicked: {
- stackView.push("Page1Form.ui.qml")
+ contentView.push("Page1Form.ui.qml")
drawer.close()
}
}
@@ -68,14 +68,14 @@ ApplicationWindow {
text: qsTr("Page 2")
width: parent.width
onClicked: {
- stackView.push("Page2Form.ui.qml")
+ contentView.push("Page2Form.ui.qml")
drawer.close()
}
}
}
}
StackView {
- id: stackView
+ id: contentView
initialItem: Onboarding {
}