chore: post merge fixes
This commit is contained in:
parent
cda9b5d496
commit
694b7896e5
3 changed files with 4 additions and 5 deletions
|
|
@ -13,7 +13,7 @@ DrawerType2 {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
expandedHeight: parent.height * 0.9
|
expandedHeight: parent.height * 0.9
|
||||||
|
|
||||||
expandedContent: Item {
|
expandedStateContent: Item {
|
||||||
implicitHeight: root.expandedHeight
|
implicitHeight: root.expandedHeight
|
||||||
|
|
||||||
Header2TextType {
|
Header2TextType {
|
||||||
|
|
@ -73,7 +73,7 @@ DrawerType2 {
|
||||||
PageController.showBusyIndicator(true)
|
PageController.showBusyIndicator(true)
|
||||||
UpdateController.runInstaller()
|
UpdateController.runInstaller()
|
||||||
PageController.showBusyIndicator(false)
|
PageController.showBusyIndicator(false)
|
||||||
root.close()
|
root.closeTriggered()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -96,7 +96,7 @@ DrawerType2 {
|
||||||
text: qsTr("Skip")
|
text: qsTr("Skip")
|
||||||
|
|
||||||
clickedFunc: function() {
|
clickedFunc: function() {
|
||||||
root.close()
|
root.closeTriggered()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,6 @@ Item {
|
||||||
id: timer
|
id: timer
|
||||||
interval: 200 // Milliseconds
|
interval: 200 // Milliseconds
|
||||||
onTriggered: {
|
onTriggered: {
|
||||||
console.debug(">>> PageType timer triggered")
|
|
||||||
FocusController.resetRootObject()
|
FocusController.resetRootObject()
|
||||||
FocusController.setFocusOnDefaultItem()
|
FocusController.setFocusOnDefaultItem()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -98,7 +98,7 @@ Window {
|
||||||
}
|
}
|
||||||
|
|
||||||
function onShowChangelogDrawer() {
|
function onShowChangelogDrawer() {
|
||||||
changelogDrawer.open()
|
changelogDrawer.openTriggered()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue