Remove QWindow pos, geometry and size as properties; pos->position

Abbreviated properties are to be avoided.  But all 3 of these
properties are redundant from the QML perspective; and because QRect,
QPoint and QSize are (wisely) not QObjects, it's not possible to bind
to _their_ properties, which make these QWindow properties less useful
than users might assume that they are.

Change-Id: I19c00b54b1d2712f9418e8bcf56e35a8008b89ef
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index a3eeeb15c7..6e1f22161b 100644
--- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
+++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
@@ -186,10 +186,10 @@ void tst_QWindow::positioning()
 
     QMargins originalMargins = window.frameMargins();
 
-    QCOMPARE(window.pos(), window.framePos() + QPoint(originalMargins.left(), originalMargins.top()));
+    QCOMPARE(window.position(), window.framePos() + QPoint(originalMargins.left(), originalMargins.top()));
     QVERIFY(window.frameGeometry().contains(window.geometry()));
 
-    QPoint originalPos = window.pos();
+    QPoint originalPos = window.position();
     QPoint originalFramePos = window.framePos();
 
     window.setWindowState(Qt::WindowFullScreen);
@@ -200,7 +200,7 @@ void tst_QWindow::positioning()
     QCoreApplication::processEvents();
     QTRY_COMPARE(window.received(QEvent::Resize), 3);
 
-    QTRY_COMPARE(originalPos, window.pos());
+    QTRY_COMPARE(originalPos, window.position());
     QTRY_COMPARE(originalFramePos, window.framePos());
     QTRY_COMPARE(originalMargins, window.frameMargins());
 
@@ -215,14 +215,14 @@ void tst_QWindow::positioning()
         QTRY_VERIFY(window.received(QEvent::Move));
         QTRY_COMPARE(framePos, window.framePos());
         QTRY_COMPARE(originalMargins, window.frameMargins());
-        QCOMPARE(window.pos(), window.framePos() + QPoint(originalMargins.left(), originalMargins.top()));
+        QCOMPARE(window.position(), window.framePos() + QPoint(originalMargins.left(), originalMargins.top()));
 
         // and back to regular positioning
 
         window.reset();
-        window.setPos(originalPos);
+        window.setPosition(originalPos);
         QTRY_VERIFY(window.received(QEvent::Move));
-        QTRY_COMPARE(originalPos, window.pos());
+        QTRY_COMPARE(originalPos, window.position());
     }
 }