From feb996e3ab44e68082c97102556ea396f5df3f44 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Wed, 11 Jul 2012 17:32:16 +1000 Subject: 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 --- src/quick/util/qquickimageprovider.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/quick/util/qquickimageprovider.h') diff --git a/src/quick/util/qquickimageprovider.h b/src/quick/util/qquickimageprovider.h index 459b3ea48d..dd814d406b 100644 --- a/src/quick/util/qquickimageprovider.h +++ b/src/quick/util/qquickimageprovider.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QQuickImageProviderPrivate; class QSGTexture; -class QQuickCanvas; +class QQuickWindow; class Q_QUICK_EXPORT QQuickTextureFactory : public QObject { @@ -62,7 +62,7 @@ public: QQuickTextureFactory(); virtual ~QQuickTextureFactory(); - virtual QSGTexture *createTexture(QQuickCanvas *canvas) const = 0; + virtual QSGTexture *createTexture(QQuickWindow *window) const = 0; virtual QSize textureSize() const = 0; virtual int textureByteCount() const = 0; virtual QImage image() const; -- cgit v1.2.3