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/items/qquickimage.cpp | |
| 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/items/qquickimage.cpp')
| -rw-r--r-- | src/quick/items/qquickimage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp index 141e643d20..4279e27832 100644 --- a/src/quick/items/qquickimage.cpp +++ b/src/quick/items/qquickimage.cpp @@ -536,7 +536,7 @@ QSGTextureProvider *QQuickImage::textureProvider() const Q_D(const QQuickImage); if (!d->provider) { // Make sure it gets thread affinity on the rendering thread so deletion works properly.. - Q_ASSERT_X(d->canvas + Q_ASSERT_X(d->window && d->sceneGraphContext() && QThread::currentThread() == d->sceneGraphContext()->thread(), "QQuickImage::textureProvider", @@ -544,7 +544,7 @@ QSGTextureProvider *QQuickImage::textureProvider() const QQuickImagePrivate *dd = const_cast<QQuickImagePrivate *>(d); dd->provider = new QQuickImageTextureProvider; dd->provider->m_smooth = d->smooth; - dd->provider->m_texture = d->sceneGraphContext()->textureForFactory(d->pix.textureFactory(), canvas()); + dd->provider->m_texture = d->sceneGraphContext()->textureForFactory(d->pix.textureFactory(), window()); } return d->provider; @@ -554,7 +554,7 @@ QSGNode *QQuickImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) { Q_D(QQuickImage); - QSGTexture *texture = d->sceneGraphContext()->textureForFactory(d->pix.textureFactory(), canvas()); + QSGTexture *texture = d->sceneGraphContext()->textureForFactory(d->pix.textureFactory(), window()); // Copy over the current texture state into the texture provider... if (d->provider) { |