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, 10 insertions, 10 deletions

diff --git a/tests/auto/quick/qquickflipable/tst_qquickflipable.cpp b/tests/auto/quick/qquickflipable/tst_qquickflipable.cpp
index 8c1c248925..37e29f6385 100644
--- a/tests/auto/quick/qquickflipable/tst_qquickflipable.cpp
+++ b/tests/auto/quick/qquickflipable/tst_qquickflipable.cpp
@@ -126,22 +126,22 @@ void tst_qquickflipable::flipFlipable()
 
 void tst_qquickflipable::QTBUG_9161_crash()
 {
-    QQuickView *canvas = new QQuickView;
-    canvas->setSource(testFileUrl("crash.qml"));
-    QQuickItem *root = canvas->rootObject();
+    QQuickView *window = new QQuickView;
+    window->setSource(testFileUrl("crash.qml"));
+    QQuickItem *root = window->rootObject();
     QVERIFY(root != 0);
-    canvas->show();
-    delete canvas;
+    window->show();
+    delete window;
 }
 
 void tst_qquickflipable::QTBUG_8474_qgv_abort()
 {
-    QQuickView *canvas = new QQuickView;
-    canvas->setSource(testFileUrl("flipable-abort.qml"));
-    QQuickItem *root = canvas->rootObject();
+    QQuickView *window = new QQuickView;
+    window->setSource(testFileUrl("flipable-abort.qml"));
+    QQuickItem *root = window->rootObject();
     QVERIFY(root != 0);
-    canvas->show();
-    delete canvas;
+    window->show();
+    delete window;
 }
 
 QTEST_MAIN(tst_qquickflipable)