diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2012-07-11 17:32:16 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-17 07:26:15 +0200 |
| commit | feb996e3ab44e68082c97102556ea396f5df3f44 (patch) | |
| tree | 7613a8a4eaf5a8e0fb2801e9d0d9d1869524c348 /src/quick/util | |
| parent | 68bbdacd2d5a6fa02f085a996411fb2b71875174 (diff) | |
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>
Diffstat (limited to 'src/quick/util')
| -rw-r--r-- | src/quick/util/qquickimageprovider.h | 4 | ||||
| -rw-r--r-- | src/quick/util/qquickpixmapcache.cpp | 2 | ||||
| -rw-r--r-- | src/quick/util/qquickpixmapcache_p.h | 2 |
3 files changed, 4 insertions, 4 deletions
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; diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp index 592def19a9..1f4da46ca6 100644 --- a/src/quick/util/qquickpixmapcache.cpp +++ b/src/quick/util/qquickpixmapcache.cpp @@ -88,7 +88,7 @@ static inline QString imageId(const QUrl &url) return url.toString(QUrl::RemoveScheme | QUrl::RemoveAuthority).mid(1); } -QSGTexture *QQuickDefaultTextureFactory::createTexture(QQuickCanvas *) const +QSGTexture *QQuickDefaultTextureFactory::createTexture(QQuickWindow *) const { QSGPlainTexture *t = new QSGPlainTexture(); t->setImage(im); diff --git a/src/quick/util/qquickpixmapcache_p.h b/src/quick/util/qquickpixmapcache_p.h index 3695c308e4..ca4405c80c 100644 --- a/src/quick/util/qquickpixmapcache_p.h +++ b/src/quick/util/qquickpixmapcache_p.h @@ -68,7 +68,7 @@ public: { } - QSGTexture *createTexture(QQuickCanvas *canvas) const; + QSGTexture *createTexture(QQuickWindow *window) const; QSize textureSize() const { return im.size(); } int textureByteCount() const { return im.byteCount(); } QImage image() const { return im; } |