fix tests after merging trunk
commite4b1d1e499af02d1547be865f8fb55e1fadd5ae9
authorMichael Zanetti <michael.zanetti@canonical.com>
dateWed 24 Jun 2015, 14:07 (11 years ago)
parent42d4f76
qml/Stages/DesktopStage.qml+5
@@ -192,6 +192,11 @@ Rectangle {
192192 ApplicationManager.requestFocusApplication(model.appId);
193193 }
194194 }
195+ Component.onCompleted: {
196+ if (ApplicationManager.focusedApplicationId == model.appId) {
197+ decoratedWindow.forceActiveFocus();
198+ }
199+ }
195200
196201 states: [
197202 State {
tests/qmltests/tst_Shell.qml+2−1
@@ -782,7 +782,8 @@ Rectangle {
782782
783783 // check that the desktop stage and window have been loaded
784784 {
785− var desktopWindow = findChild(shell, "decoratedWindow_webbrowser-app");
785+ var desktopWindow = findChild(shell, "appWindow_webbrowser-app");
786+ print("have desktopWindow", desktopWindow)
786787 verify(desktopWindow);
787788 }
788789