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

diff --git a/tests/auto/particles/shared/particlestestsshared.h b/tests/auto/particles/shared/particlestestsshared.h
index d1d1813d94..6cd805a64c 100644
--- a/tests/auto/particles/shared/particlestestsshared.h
+++ b/tests/auto/particles/shared/particlestestsshared.h
@@ -68,17 +68,17 @@ bool myFuzzyGEQ(qreal a, qreal b)
 
 QQuickView* createView(const QUrl &filename, int additionalWait=0)
 {
-    QQuickView *canvas = new QQuickView(0);
+    QQuickView *view = new QQuickView(0);
 
-    canvas->setSource(filename);
-    if (canvas->status() != QQuickView::Ready)
+    view->setSource(filename);
+    if (view->status() != QQuickView::Ready)
         return 0;
-    canvas->show();
-    QTest::qWaitForWindowShown(canvas);
+    view->show();
+    QTest::qWaitForWindowShown(view);
     if (additionalWait)
         QTest::qWait(additionalWait);
 
-    return canvas;
+    return view;
 }
 
 void ensureAnimTime(int requiredTime, QAbstractAnimation* anim)//With consistentTiming, who knows how long an animation really takes...