on xenial help sign in
restore chunk of broken merge

grrr bzrrrr

commit0e8cd09b4e6e45f2cd48058f6ec18fd3c0c76ab7 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateWed 23 Mar 2016, 22:06 (11 years ago) parentac310bf
1 file changed+4
tests/qmltests/tst_Shell.qml+4
tests/qmltests/tst_Shell.qml+4
@@ -2308,6 +2308,10 @@ Rectangle {
23082308 keyClick(Qt.Key_Space, Qt.MetaModifier);
23092309
23102310 // go to e.g. desktop stage
2311+ loadShell("desktop");
2312+ shell.usageScenario = "desktop";
2313+ waitForRendering(shell);
2314+
23112315 // start a second app, should get the last configured keyboard, "fr"
23122316 var app2 = ApplicationManager.startApplication("calendar-app");
23132317 waitUntilAppWindowIsFullyLoaded(app2);