git.iko.soy/unity8
on xenial help sign in
clarify comments, try to stabilize the test
544280fLukáš Tinkl
qml/Stages/PhoneStage.qml+1−1
compare with xenial
unifiedsplit
@@ -471,7 +471,7 @@ AbstractStage {
471 model: topLevelSurfaceList
471 model: topLevelSurfaceList
472
472
473 onItemRemoved: {
473 onItemRemoved: {
474− // Unless we're closing the app ourselves in the spread,
474+ // Unless we're closing the app ourselves,
475 // lets make sure the spread doesn't mess up by the changing app list.
475 // lets make sure the spread doesn't mess up by the changing app list.
476 if (spreadView.closingIndex == -1) {
476 if (spreadView.closingIndex == -1) {
477 spreadView.phase = 0;
477 spreadView.phase = 0;
qml/Stages/TabletStage.qml+1−1
@@ -713,7 +713,7 @@ AbstractStage {
713
713
714 onItemRemoved: {
714 onItemRemoved: {
715 priv.updateMainAndSideStageIndexes();
715 priv.updateMainAndSideStageIndexes();
716− // Unless we're closing the app ourselves in the spread,
716+ // Unless we're closing the app ourselves,
717 // lets make sure the spread doesn't mess up by the changing app list.
717 // lets make sure the spread doesn't mess up by the changing app list.
718 if (spreadView.closingIndex == -1) {
718 if (spreadView.closingIndex == -1) {
719 spreadView.phase = 0;
719 spreadView.phase = 0;
tests/qmltests/tst_Shell.qml+1−1
@@ -2482,7 +2482,7 @@ Rectangle {
2482 keyClick(Qt.Key_F4, Qt.AltModifier);
2482 keyClick(Qt.Key_F4, Qt.AltModifier);
2483
2483
2484 tryCompare(topLevelSurfaceList, "count", countBeforeClose - 1);
2484 tryCompare(topLevelSurfaceList, "count", countBeforeClose - 1);
2485− tryCompare(ApplicationManager, "focusedApplicationId", "calendar-app");
2485+ tryCompareFunction(function() { return ApplicationManager.focusedApplicationId; }, "calendar-app");
2486 }
2486 }
2487 }
2487 }
2488}
2488}