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

diff --git a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp
index 7e32ca054e..30994b729e 100644
--- a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp
+++ b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp
@@ -98,8 +98,8 @@ private:
 
 void tst_qquickborderimage::cleanup()
 {
-    QQuickCanvas canvas;
-    canvas.releaseResources();
+    QQuickWindow window;
+    window.releaseResources();
     engine.clearComponentCache();
 }
 
@@ -237,12 +237,12 @@ void tst_qquickborderimage::smooth()
 
 void tst_qquickborderimage::mirror()
 {
-    QQuickView *canvas = new QQuickView;
-    canvas->setSource(testFileUrl("mirror.qml"));
-    QQuickBorderImage *image = qobject_cast<QQuickBorderImage*>(canvas->rootObject());
+    QQuickView *window = new QQuickView;
+    window->setSource(testFileUrl("mirror.qml"));
+    QQuickBorderImage *image = qobject_cast<QQuickBorderImage*>(window->rootObject());
     QVERIFY(image != 0);
 
-    QImage screenshot = canvas->grabFrameBuffer();
+    QImage screenshot = window->grabWindow();
 
     QImage srcPixmap(screenshot);
     QTransform transform;
@@ -250,10 +250,10 @@ void tst_qquickborderimage::mirror()
     srcPixmap = srcPixmap.transformed(transform);
 
     image->setProperty("mirror", true);
-    screenshot = canvas->grabFrameBuffer();
+    screenshot = window->grabWindow();
     QCOMPARE(screenshot, srcPixmap);
 
-    delete canvas;
+    delete window;
 }
 
 void tst_qquickborderimage::tileModes()