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

diff --git a/tests/auto/quick/examples/tst_examples.cpp b/tests/auto/quick/examples/tst_examples.cpp
index 6cce5b82f2..309a149a5e 100644
--- a/tests/auto/quick/examples/tst_examples.cpp
+++ b/tests/auto/quick/examples/tst_examples.cpp
@@ -83,10 +83,10 @@ private:
 
     QQmlEngine engine;
 
-    QQuickCanvas *canvas;
+    QQuickWindow *window;
 };
 
-tst_examples::tst_examples() : canvas(0)
+tst_examples::tst_examples() : window(0)
 {
     // Add files to exclude here
     excludedFiles << "examples/quick/canvas/tiger/tiger.qml"; // QTBUG-26528
@@ -123,7 +123,7 @@ tst_examples::tst_examples() : canvas(0)
 
 tst_examples::~tst_examples()
 {
-    delete canvas;
+    delete window;
 }
 
 void tst_examples::init()
@@ -262,13 +262,13 @@ void tst_examples::sgexamples()
         component.completeCreate();
     QVERIFY(root);
 
-    if (!canvas) {
-        canvas = new QQuickCanvas();
-        canvas->resize(240, 320);
-        canvas->show();
-        QTest::qWaitForWindowShown(canvas);
+    if (!window) {
+        window = new QQuickWindow();
+        window->resize(240, 320);
+        window->show();
+        QTest::qWaitForWindowShown(window);
     }
-    root->setParentItem(canvas->rootItem());
+    root->setParentItem(window->rootItem());
     component.completeCreate();
 
     qApp->processEvents();
@@ -306,13 +306,13 @@ void tst_examples::sgsnippets()
         component.completeCreate();
     QVERIFY(root);
 
-    if (!canvas) {
-        canvas = new QQuickCanvas();
-        canvas->resize(240, 320);
-        canvas->show();
-        QTest::qWaitForWindowShown(canvas);
+    if (!window) {
+        window = new QQuickWindow();
+        window->resize(240, 320);
+        window->show();
+        QTest::qWaitForWindowShown(window);
     }
-    root->setParentItem(canvas->rootItem());
+    root->setParentItem(window->rootItem());
     component.completeCreate();
 
     qApp->processEvents();