1 files changed, 44 insertions, 2 deletions
diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp
index 781fcccd9f..14dc6c3377 100644
--- a/src/quick/items/qquickimage.cpp
+++ b/src/quick/items/qquickimage.cpp
@@ -49,6 +49,7 @@
 
 #include <QtGui/qpainter.h>
 #include <qmath.h>
+#include <QtCore/QRunnable>
 
 QT_BEGIN_NAMESPACE
 
@@ -100,6 +101,14 @@ QQuickImagePrivate::QQuickImagePrivate()
 {
 }
 
+class QQuickImageCleanup : public QRunnable
+{
+public:
+    QQuickImageCleanup(QQuickImageTextureProvider *p) : provider(p) { }
+    void run() Q_DECL_OVERRIDE { delete provider; }
+    QQuickImageTextureProvider *provider;
+};
+
 /*!
     \qmltype Image
     \instantiates QQuickImage
@@ -159,18 +168,24 @@ QQuickImagePrivate::QQuickImagePrivate()
 QQuickImage::QQuickImage(QQuickItem *parent)
     : QQuickImageBase(*(new QQuickImagePrivate), parent)
 {
+    connect(this, SIGNAL(sceneGraphInvalidated()), this, SLOT(invalidateSG()));
 }
 
 QQuickImage::QQuickImage(QQuickImagePrivate &dd, QQuickItem *parent)
     : QQuickImageBase(dd, parent)
 {
+    connect(this, SIGNAL(sceneGraphInvalidated()), this, SLOT(invalidateSG()));
 }
 
 QQuickImage::~QQuickImage()
 {
     Q_D(QQuickImage);
-    if (d->provider)
-        d->provider->deleteLater();
+    if (QQuickWindow *w = window()) {
+        w->scheduleRenderJob(new QQuickImageCleanup(d->provider), QQuickWindow::AfterSynchronizingStage);
+    } else {
+        // Should have been released already in releaseResources or in invalidateSG.
+        Q_ASSERT(!d->provider);
+    }
 }
 
 void QQuickImagePrivate::setImage(const QImage &image)
@@ -184,6 +199,17 @@ void QQuickImagePrivate::setImage(const QImage &image)
     q->update();
 }
 
+void QQuickImagePrivate::setPixmap(const QQuickPixmap &pixmap)
+{
+    Q_Q(QQuickImage);
+    pix.setPixmap(pixmap);
+
+    q->pixmapChange();
+    status = pix.isNull() ? QQuickImageBase::Null : QQuickImageBase::Ready;
+
+    q->update();
+}
+
 /*!
     \qmlproperty enumeration QtQuick::Image::fillMode
 
@@ -560,6 +586,22 @@ QSGTextureProvider *QQuickImage::textureProvider() const
     return d->provider;
 }
 
+void QQuickImage::invalidateSG()
+{
+    Q_D(QQuickImage);
+    delete d->provider;
+    d->provider = 0;
+}
+
+void QQuickImage::releaseResources()
+{
+    Q_D(QQuickImage);
+    if (d->provider) {
+        window()->scheduleRenderJob(new QQuickImageCleanup(d->provider), QQuickWindow::AfterSynchronizingStage);
+        d->provider = 0;
+    }
+}
+
 QSGNode *QQuickImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
 {
     Q_D(QQuickImage);