Merge remote-tracking branch 'origin/5.8' into 5.9

Conflicts:
	src/qml/compiler/qv4ssa.cpp
	src/quick/accessible/qaccessiblequickview_p.h
	src/quick/items/qquickmousearea.cpp
	src/quick/util/qquickanimatorjob.cpp
	tools/qmlplugindump/main.cpp

Change-Id: I84474cf39895b9b757403971d2e9196e8c9d1809

1 files changed, 8 insertions, 8 deletions

diff --git a/examples/quick/imageresponseprovider/imageresponseprovider.cpp b/examples/quick/imageresponseprovider/imageresponseprovider.cpp
index a888c823a6..d4633b779a 100644
--- a/examples/quick/imageresponseprovider/imageresponseprovider.cpp
+++ b/examples/quick/imageresponseprovider/imageresponseprovider.cpp
@@ -51,37 +51,37 @@ class AsyncImageResponse : public QQuickImageResponse, public QRunnable
 {
     public:
         AsyncImageResponse(const QString &id, const QSize &requestedSize)
-         : m_id(id), m_requestedSize(requestedSize), m_texture(0)
+         : m_id(id), m_requestedSize(requestedSize)
         {
             setAutoDelete(false);
         }
 
         QQuickTextureFactory *textureFactory() const
         {
-            return m_texture;
+            return QQuickTextureFactory::textureFactoryForImage(m_image);
         }
 
         void run()
         {
-            QImage image(50, 50, QImage::Format_RGB32);
+            m_image = QImage(50, 50, QImage::Format_RGB32);
             if (m_id == "slow") {
                 qDebug() << "Slow, red, sleeping for 5 seconds";
                 QThread::sleep(5);
-                image.fill(Qt::red);
+                m_image.fill(Qt::red);
             } else {
                 qDebug() << "Fast, blue, sleeping for 1 second";
                 QThread::sleep(1);
-                image.fill(Qt::blue);
+                m_image.fill(Qt::blue);
             }
             if (m_requestedSize.isValid())
-                image = image.scaled(m_requestedSize);
-            m_texture = QQuickTextureFactory::textureFactoryForImage(image);
+                m_image = m_image.scaled(m_requestedSize);
+
             emit finished();
         }
 
         QString m_id;
         QSize m_requestedSize;
-        QQuickTextureFactory *m_texture;
+        QImage m_image;
 };
 
 class AsyncImageProvider : public QQuickAsyncImageProvider