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

diff --git a/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp b/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp
index a8bf69e657..020a77c1d9 100644
--- a/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp
+++ b/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp
@@ -61,7 +61,7 @@ public:
         view.show();
         QTest::qWaitForWindowShown(&view);
 
-        return view.grabFrameBuffer();
+        return view.grabWindow();
     }
 
 private slots:
@@ -268,7 +268,7 @@ void tst_QQuickItemLayer::layerVisibility()
 
     QTest::qWaitForWindowActive(&view);
 
-    QImage fb = view.grabFrameBuffer();
+    QImage fb = view.grabWindow();
     uint pixel = fb.pixel(0, 0);
 
     if (!visible || opacity == 0) {
@@ -312,7 +312,7 @@ void tst_QQuickItemLayer::layerZOrder()
 
     QTest::qWaitForWindowShown(&view);
 
-    QImage fb = view.grabFrameBuffer();
+    QImage fb = view.grabWindow();
 
     QCOMPARE(fb.pixel(50, 50), qRgb(0, 0, 0xff));
     QCOMPARE(fb.pixel(150, 150), qRgb(0, 0xff, 00));
@@ -349,7 +349,7 @@ void tst_QQuickItemLayer::changeZOrder()
 
     QTest::qWaitForWindowShown(&view);
 
-    QImage fb = view.grabFrameBuffer();
+    QImage fb = view.grabWindow();
 
     QRgb topLeft = fb.pixel(50, 50);
     QRgb topRight = fb.pixel(150, 50);