aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/sharedimage/sharedimageprovider.h
diff options
context:
space:
mode:
authorEirik Aavitsland <eirik.aavitsland@qt.io>2017-03-24 09:36:22 +0100
committerEirik Aavitsland <eirik.aavitsland@qt.io>2017-04-28 14:15:23 +0000
commit4a4a8e911cfafcff069de0c1acb2462974166938 (patch)
treee832682afe281d507ea73e8fc0272c0738c8efd5 /src/imports/sharedimage/sharedimageprovider.h
parent3b798efeb0029bb5314c7bd960f43357b39a394a (diff)
Polish the shared image provider
When the new shared memory image provider was added, some of the issues identified during review were postponed to be fixed during stabilization phase. This commit deals with - Replace the kludge for registering plugin version - Add autotest - Place plugin in labs - Use QT_CONFIG instead of QT_NO_xxx - Use the new extended image provider api, in order to use the scaled-size calculation from Quick Change-Id: I75c01c7565650fcf859411dde9520ee65b2b0c64 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'src/imports/sharedimage/sharedimageprovider.h')
-rw-r--r--src/imports/sharedimage/sharedimageprovider.h5
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;