clarify comments, try to stabilize the test
commit544280f7c0033f594ea772357023fc14dfb3fd3d
authorLukáš Tinkl <lukas.tinkl@canonical.com>
dateThu 2 Jun 2016, 15:11 (10 years ago)
parenta514e15
qml/Stages/PhoneStage.qml+1−1
@@ -471,7 +471,7 @@ AbstractStage {
471471 model: topLevelSurfaceList
472472
473473 onItemRemoved: {
474− // Unless we're closing the app ourselves in the spread,
474+ // Unless we're closing the app ourselves,
475475 // lets make sure the spread doesn't mess up by the changing app list.
476476 if (spreadView.closingIndex == -1) {
477477 spreadView.phase = 0;
qml/Stages/TabletStage.qml+1−1
@@ -713,7 +713,7 @@ AbstractStage {
713713
714714 onItemRemoved: {
715715 priv.updateMainAndSideStageIndexes();
716− // Unless we're closing the app ourselves in the spread,
716+ // Unless we're closing the app ourselves,
717717 // lets make sure the spread doesn't mess up by the changing app list.
718718 if (spreadView.closingIndex == -1) {
719719 spreadView.phase = 0;
tests/qmltests/tst_Shell.qml+1−1
@@ -2482,7 +2482,7 @@ Rectangle {
24822482 keyClick(Qt.Key_F4, Qt.AltModifier);
24832483
24842484 tryCompare(topLevelSurfaceList, "count", countBeforeClose - 1);
2485− tryCompare(ApplicationManager, "focusedApplicationId", "calendar-app");
2485+ tryCompareFunction(function() { return ApplicationManager.focusedApplicationId; }, "calendar-app");
24862486 }
24872487 }
24882488}