@@ -37,20 +37,10 @@ Rectangle {
3737 height: units.gu(71)
3838
3939 QtObject {
40− id: applicationArguments
41−
42− function hasGeometry() {
43− return false;
44− }
45−
46− function width() {
47− return 0;
48− }
49−
50− function height() {
51− return 0;
52− }
40+ id: _screenWindow
41+ property bool primary: true
5342 }
43+ property alias screenWindow: _screenWindow
5444
5545 Telephony.CallEntry {
5646 id: phoneCall
@@ -154,6 +144,10 @@ Rectangle {
154144 Component.onDestruction: {
155145 shellLoader.itemDestroyed = true;
156146 }
147+ SurfaceManager {
148+ id: surfaceMan
149+ }
150+ surfaceManager: surfaceMan
157151 }
158152 }
159153 }
@@ -238,7 +232,7 @@ Rectangle {
238232 }
239233
240234 ItemSelector {
241− id: modeSelector
235+ id: modeSelector
242236 anchors { left: parent.left; right: parent.right }
243237 activeFocusOnPress: false
244238 text: "Mode"
@@ -327,9 +321,7 @@ Rectangle {
327321 }
328322
329323 function ensureInputMethodSurface() {
330− var surfaceManager = findInvisibleChild(shell, "surfaceManager");
331− verify(surfaceManager);
332− surfaceManager.createInputMethodSurface();
324+ shell.surfaceManager.createInputMethodSurface();
333325
334326 tryCompareFunction(function() { return topLevelSurfaceList.inputMethodSurface !== null }, true);
335327 }