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

Change-Id: I71275a2076c3d32ee2896571be882067320a2e9e

1 files changed, 3 insertions, 2 deletions

diff --git a/src/imports/sharedimage/sharedimageprovider.h b/src/imports/sharedimage/sharedimageprovider.h
index a2f6b6ef2f..e6b6c77134 100644
--- a/src/imports/sharedimage/sharedimageprovider.h
+++ b/src/imports/sharedimage/sharedimageprovider.h
@@ -41,16 +41,17 @@
 #define SHAREDIMAGEPROVIDER_H
 
 #include <QQuickImageProvider>
+#include <private/qquickpixmapcache_p.h>
 #include <QScopedPointer>
 
 class QuickSharedImageLoader;
 
-class SharedImageProvider : public QQuickImageProvider
+class SharedImageProvider : public QQuickImageProviderWithOptions
 {
 public:
     SharedImageProvider();
 
-    QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) override;
+    QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize, const QQuickImageProviderOptions &options) override;
 
 protected:
     QScopedPointer<QuickSharedImageLoader> loader;