diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-02 09:05:12 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-02 09:05:12 +0100 |
commit | 78dd18a0cd18449e1289e428ea6eca65e28fb114 (patch) | |
tree | bbb442c218d1504adb70d49ae67ac78a9c2c42bd /examples | |
parent | 015dff255ff0f40c553b1dee43c6cff013df64eb (diff) | |
parent | 8c864e52369ee4d55a1d9345215c8153144b5939 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I6cbd83b61fac34c2ba6936711289ec09a490719a
Diffstat (limited to 'examples')
-rw-r--r-- | examples/quick/imageresponseprovider/imageresponseprovider.cpp | 16 |
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 |