git.iko.soy/unity8
on xenial help sign in
Fix a missing finish() method
efc5d22Michael Terry
qml/Tutorial/Tutorial.qml+6
compare with xenial
unifiedsplit
@@ -34,6 +34,12 @@ Item {
34 readonly property bool panelContentEnabled: loader.item ? loader.item.panelContentEnabled : true
34 readonly property bool panelContentEnabled: loader.item ? loader.item.panelContentEnabled : true
35 readonly property bool running: loader.item ? loader.item.running : false
35 readonly property bool running: loader.item ? loader.item.running : false
36
36
37+ function finish() {
38+ if (loader.item) {
39+ loader.item.finish();
40+ }
41+ }
42+
37 signal finished()
43 signal finished()
38
44
39 Loader {
45 Loader {
tests/qmltests/Tutorial/tst_Tutorial.qml+1−1
@@ -229,7 +229,7 @@ Item {
229 // Make sure we don't do anything if we don't pull the launcher
229 // Make sure we don't do anything if we don't pull the launcher
230 // out much.
230 // out much.
231 var launcher = findChild(shell, "launcher");
231 var launcher = findChild(shell, "launcher");
232− touchFlick(shell, 0, halfHeight, launcher.panelWidth * 0.6, halfHeight);
232+ touchFlick(shell, 0, halfHeight, launcher.panelWidth * 0.4, halfHeight);
233 tryCompare(launcher, "state", ""); // should remain hidden
233 tryCompare(launcher, "state", ""); // should remain hidden
234 tryCompare(left, "shown", true); // and we should still be on left
234 tryCompare(left, "shown", true); // and we should still be on left
235
235