@@ -52,20 +52,15 @@ Rectangle {
5252 application: fakeApplication
5353 }
5454 }
55− FocusScope {
56− id: appFocus
55+ Loader {
56+ id: applicationWindowLoader
5757 anchors {
5858 top: parent.top
5959 bottom: parent.bottom
6060 left: parent.left
6161 }
6262 width: units.gu(40)
63−
64− Loader {
65− id: applicationWindowLoader
66− anchors.fill: parent
67− sourceComponent: applicationWindowComponent
68− }
63+ sourceComponent: applicationWindowComponent
6964 }
7065
7166 Rectangle {
@@ -73,7 +68,7 @@ Rectangle {
7368 anchors {
7469 top: parent.top
7570 bottom: parent.bottom
76− left: appFocus.right
71+ left: applicationWindowLoader.right
7772 right: parent.right
7873 }
7974
@@ -384,15 +379,19 @@ Rectangle {
384379 verify(stateGroup.state === "void");
385380 }
386381
387− // should be forcing active focus when interactive changes,
388− // which will cause a FocusScope higher in the object hierarchy tp be given the focus
389382 function test_forceActiveFocusFollowsInterative() {
390383 fakeApplication.createSession();
391384 applicationWindowLoader.item.interactive = false;
392385 applicationWindowLoader.item.interactive = true;
393386 fakeSession.createSurface();
394387
395− compare(appFocus.focus, true);
388+ compare(fakeSession.surface.activeFocus, true);
389+
390+ applicationWindowLoader.item.interactive = false;
391+ compare(fakeSession.surface.activeFocus, false);
392+
393+ applicationWindowLoader.item.interactive = true;
394+ compare(fakeSession.surface.activeFocus, true);
396395 }
397396 }
398397}