@@ -240,10 +240,10 @@ Item {
240240 property var fakeWindow: windowLoader.item
241241
242242 function init() {
243− fakeWindow.requestedX = units.gu(20)
244− fakeWindow.requestedY = units.gu(20)
245− fakeWindow.requestedWidth = units.gu(20)
246− fakeWindow.requestedHeight = units.gu(20)
243+ fakeWindow.windowedX = units.gu(20)
244+ fakeWindow.windowedY = units.gu(20)
245+ fakeWindow.windowedWidth = units.gu(20)
246+ fakeWindow.windowedHeight = units.gu(20)
247247 fakeWindow.resizeAreaMinWidth = units.gu(15);
248248 fakeWindow.resizeAreaMinHeight = units.gu(10);
249249 fakeWindow.minimumWidth = 0;
@@ -268,8 +268,8 @@ Item {
268268 }
269269
270270 function test_resizeWindowRightBottom(data) {
271− var initialWindowX = fakeWindow.requestedX;
272− var initialWindowY = fakeWindow.requestedY;
271+ var initialWindowX = fakeWindow.windowedX;
272+ var initialWindowY = fakeWindow.windowedY;
273273 var initialWindowWidth = fakeWindow.width
274274 var initialWindowHeight = fakeWindow.height
275275
@@ -294,8 +294,8 @@ Item {
294294 }
295295
296296 function test_resizeWindowLeftTop(data) {
297− var initialWindowX = fakeWindow.requestedX;
298− var initialWindowY = fakeWindow.requestedY;
297+ var initialWindowX = fakeWindow.windowedX;
298+ var initialWindowY = fakeWindow.windowedY;
299299 var initialWindowWidth = fakeWindow.width
300300 var initialWindowHeight = fakeWindow.height
301301
@@ -313,8 +313,8 @@ Item {
313313 }
314314
315315 function test_saveRestoreSize() {
316− var initialWindowX = fakeWindow.requestedX;
317− var initialWindowY = fakeWindow.requestedY;
316+ var initialWindowX = fakeWindow.windowedX;
317+ var initialWindowY = fakeWindow.windowedY;
318318 var initialWindowWidth = fakeWindow.width
319319 var initialWindowHeight = fakeWindow.height
320320
@@ -346,8 +346,8 @@ Item {
346346 }
347347
348348 function test_resizeSmallerAndLarger(data) {
349− var initialWindowX = fakeWindow.requestedX;
350− var initialWindowY = fakeWindow.requestedY;
349+ var initialWindowX = fakeWindow.windowedX;
350+ var initialWindowY = fakeWindow.windowedY;
351351 var initialWindowWidth = fakeWindow.width
352352 var initialWindowHeight = fakeWindow.height
353353
@@ -362,18 +362,18 @@ Item {
362362 }
363363
364364 function test_saveRestoreMaximized() {
365− var initialWindowX = fakeWindow.requestedX;
366− var initialWindowY = fakeWindow.requestedY;
365+ var initialWindowX = fakeWindow.windowedX;
366+ var initialWindowY = fakeWindow.windowedY;
367367
368368 var moveDelta = units.gu(5);
369369
370− fakeWindow.requestedX = initialWindowX + moveDelta
371− fakeWindow.requestedY = initialWindowY + moveDelta
370+ fakeWindow.windowedX = initialWindowX + moveDelta
371+ fakeWindow.windowedY = initialWindowY + moveDelta
372372
373373 // Now change the state to maximized. The window should not keep updating the stored values
374374 fakeWindow.maximize()
375− fakeWindow.requestedX = 31415 // 0 is too risky to pass the test even when broken
376− fakeWindow.requestedY = 31415
375+ fakeWindow.windowedX = 31415 // 0 is too risky to pass the test even when broken
376+ fakeWindow.windowedY = 31415
377377
378378 // This will destroy the window and recreate it
379379 windowLoader.active = false;
@@ -403,8 +403,8 @@ Item {
403403 }
404404
405405 function test_restoreMovesIntoBounds(data) {
406− fakeWindow.requestedX = data.x;
407− fakeWindow.requestedY = data.y;
406+ fakeWindow.windowedX = data.x;
407+ fakeWindow.windowedY = data.y;
408408 fakeWindow.width = data.w;
409409 fakeWindow.height = data.h;
410410 waitForRendering(root);
@@ -431,8 +431,8 @@ Item {
431431 and height) increment value.
432432 */
433433 function test_sizeIncrement() {
434− var initialWindowX = fakeWindow.requestedX;
435− var initialWindowY = fakeWindow.requestedY;
434+ var initialWindowX = fakeWindow.windowedX;
435+ var initialWindowY = fakeWindow.windowedY;
436436 var initialWindowWidth = fakeWindow.width
437437 var initialWindowHeight = fakeWindow.height
438438
@@ -462,12 +462,12 @@ Item {
462462 Tests that when dragging a window border you cannot make it bigger than its maximum size
463463 */
464464 function test_maximumSize() {
465− fakeWindow.requestedX = units.gu(1);
466− fakeWindow.requestedY = units.gu(1);
465+ fakeWindow.windowedX = units.gu(1);
466+ fakeWindow.windowedY = units.gu(1);
467467 fakeWindow.resizeAreaMinWidth = 1; // so it does not interfere with anything
468468 fakeWindow.resizeAreaMinHeight = 1; // so it does not interfere with anything
469− fakeWindow.requestedWidth = units.gu(10);
470− fakeWindow.requestedHeight = units.gu(10);
469+ fakeWindow.windowedWidth = units.gu(10);
470+ fakeWindow.windowedHeight = units.gu(10);
471471
472472 fakeWindow.maximumWidth = units.gu(20);
473473 fakeWindow.maximumHeight = units.gu(20);
@@ -492,12 +492,12 @@ Item {
492492 Tests that when dragging a window border you cannot make it smaller than its minimum size
493493 */
494494 function test_minimumSize() {
495− fakeWindow.requestedX = units.gu(1);
496− fakeWindow.requestedY = units.gu(1);
495+ fakeWindow.windowedX = units.gu(1);
496+ fakeWindow.windowedY = units.gu(1);
497497 fakeWindow.resizeAreaMinWidth = 1; // so it does not interfere with anything
498498 fakeWindow.resizeAreaMinHeight = 1; // so it does not interfere with anything
499− fakeWindow.requestedWidth = units.gu(20);
500− fakeWindow.requestedHeight = units.gu(20);
499+ fakeWindow.windowedWidth = units.gu(20);
500+ fakeWindow.windowedHeight = units.gu(20);
501501
502502 fakeWindow.minimumWidth = units.gu(10);
503503 fakeWindow.minimumHeight = units.gu(10);