@@ -53,20 +53,15 @@ Rectangle {
5353 orientation: Qt.PortraitOrientation
5454 }
5555 }
56− FocusScope {
57− id: appFocus
56+ Loader {
57+ id: applicationWindowLoader
5858 anchors {
5959 top: parent.top
6060 bottom: parent.bottom
6161 left: parent.left
6262 }
6363 width: units.gu(40)
64−
65− Loader {
66− id: applicationWindowLoader
67− anchors.fill: parent
68− sourceComponent: applicationWindowComponent
69− }
64+ sourceComponent: applicationWindowComponent
7065 }
7166
7267 Rectangle {
@@ -74,7 +69,7 @@ Rectangle {
7469 anchors {
7570 top: parent.top
7671 bottom: parent.bottom
77− left: appFocus.right
72+ left: applicationWindowLoader.right
7873 right: parent.right
7974 }
8075
@@ -403,15 +398,19 @@ Rectangle {
403398 verify(stateGroup.state === "void");
404399 }
405400
406− // should be forcing active focus when interactive changes,
407− // which will cause a FocusScope higher in the object hierarchy tp be given the focus
408401 function test_forceActiveFocusFollowsInterative() {
409402 fakeApplication.createSession();
410403 applicationWindowLoader.item.interactive = false;
411404 applicationWindowLoader.item.interactive = true;
412405 fakeSession.createSurface();
413406
414− compare(appFocus.focus, true);
407+ compare(fakeSession.surface.activeFocus, true);
408+
409+ applicationWindowLoader.item.interactive = false;
410+ compare(fakeSession.surface.activeFocus, false);
411+
412+ applicationWindowLoader.item.interactive = true;
413+ compare(fakeSession.surface.activeFocus, true);
415414 }
416415 }
417416}