QQuickCanvas renames

QQuickCanvas is now called QQuickWindow
QQuickCanvas::rootItem is now QQuickWindow::contentItem
QQuickItem::canvas is now QQuickItem::window
QQuickItem::ItemChangeData::canvas is also renamed window
QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow
The functions related to the color property have dropped the clear from
their names.

The first three changes have interim compatibility measures in place to
ease the transition.

Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2
Reviewed-by: Martin Jones <martin.jones@nokia.com>

1 files changed, 17 insertions, 17 deletions

diff --git a/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp b/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
index fa2c1cfda0..a99a775c8b 100644
--- a/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
+++ b/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
@@ -277,12 +277,12 @@ void tst_QQuickAccessible::basicPropertiesTest()
     QAI app = QAI(QAccessible::queryAccessibleInterface(qApp));
     QCOMPARE(app->childCount(), 0);
 
-    QQuickView *canvas = new QQuickView();
-    canvas->setSource(testFileUrl("statictext.qml"));
-    canvas->show();
+    QQuickView *window = new QQuickView();
+    window->setSource(testFileUrl("statictext.qml"));
+    window->show();
     QCOMPARE(app->childCount(), 1);
 
-    QAI iface = QAI(QAccessible::queryAccessibleInterface(canvas));
+    QAI iface = QAI(QAccessible::queryAccessibleInterface(window));
     QVERIFY(iface.data());
     QCOMPARE(iface->childCount(), 1);
 
@@ -318,7 +318,7 @@ void tst_QQuickAccessible::basicPropertiesTest()
     QCOMPARE(iface->indexOfChild(text2.data()), -1);
     QCOMPARE(text2->indexOfChild(item.data()), -1);
 
-    delete canvas;
+    delete window;
 }
 
 QAI topLevelChildAt(QAccessibleInterface *iface, int x, int y)
@@ -336,13 +336,13 @@ QAI topLevelChildAt(QAccessibleInterface *iface, int x, int y)
 
 void tst_QQuickAccessible::hitTest()
 {
-    QQuickView *canvas = new QQuickView;
-    canvas->setSource(testFileUrl("hittest.qml"));
-    canvas->show();
+    QQuickView *window = new QQuickView;
+    window->setSource(testFileUrl("hittest.qml"));
+    window->show();
 
-    QAI canvasIface = QAI(QAccessible::queryAccessibleInterface(canvas));
-    QVERIFY(canvasIface.data());
-    QAI rootItem = QAI(canvasIface->child(0));
+    QAI windowIface = QAI(QAccessible::queryAccessibleInterface(window));
+    QVERIFY(windowIface.data());
+    QAI rootItem = QAI(windowIface->child(0));
     QRect rootRect = rootItem->rect();
 
     // check the root item from app
@@ -378,21 +378,21 @@ void tst_QQuickAccessible::hitTest()
     QVERIFY(rect201);
 
     QRect rect201Rect = rect201->rect();
-    rootItemIface = QAI(canvasIface->childAt(rect201Rect.x() + 20, rect201Rect.y() + 20));
+    rootItemIface = QAI(windowIface->childAt(rect201Rect.x() + 20, rect201Rect.y() + 20));
     QVERIFY(rootItemIface);
     QCOMPARE(rootItemIface->rect(), rect201Rect);
     QCOMPARE(rootItemIface->text(QAccessible::Name), QLatin1String("rect201"));
 
-    delete canvas;
+    delete window;
 }
 
 void tst_QQuickAccessible::checkableTest()
 {
-    QQuickView *canvas = new QQuickView();
-    canvas->setSource(testFileUrl("checkbuttons.qml"));
-    canvas->show();
+    QQuickView *window = new QQuickView();
+    window->setSource(testFileUrl("checkbuttons.qml"));
+    window->show();
 
-    QAI iface = QAI(QAccessible::queryAccessibleInterface(canvas));
+    QAI iface = QAI(QAccessible::queryAccessibleInterface(window));
     QVERIFY(iface.data());
     QAI root = QAI(iface->child(0));