1 files changed, 6 insertions, 9 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem_p.h b/src/quick/items/context2d/qquickcanvasitem_p.h
index d7821a53ba..300039743d 100644
--- a/src/quick/items/context2d/qquickcanvasitem_p.h
+++ b/src/quick/items/context2d/qquickcanvasitem_p.h
@@ -31,9 +31,8 @@ class QQuickCanvasContext;
 
 class QQuickCanvasItemPrivate;
 class QQuickPixmap;
-class QQmlV4Function;
 
-class QQuickCanvasPixmap : public QQmlRefCount
+class QQuickCanvasPixmap final : public QQmlRefCounted<QQuickCanvasPixmap>
 {
 public:
     QQuickCanvasPixmap(const QImage& image);
@@ -110,17 +109,17 @@ public:
 
     QImage toImage(const QRectF& rect = QRectF()) const;
 
-    Q_INVOKABLE void getContext(QQmlV4Function *args);
+    Q_INVOKABLE void getContext(QQmlV4FunctionPtr args);
 
-    Q_INVOKABLE void requestAnimationFrame(QQmlV4Function *args);
-    Q_INVOKABLE void cancelRequestAnimationFrame(QQmlV4Function *args);
+    Q_INVOKABLE void requestAnimationFrame(QQmlV4FunctionPtr args);
+    Q_INVOKABLE void cancelRequestAnimationFrame(QQmlV4FunctionPtr args);
 
     Q_INVOKABLE void requestPaint();
     Q_INVOKABLE void markDirty(const QRectF& dirtyRect = QRectF());
 
     Q_INVOKABLE bool save(const QString &filename, const QSizeF &imageSize = QSizeF()) const;
     Q_INVOKABLE QString toDataURL(const QString& type = QLatin1String("image/png")) const;
-    QQmlRefPointer<QQuickCanvasPixmap> loadedPixmap(const QUrl& url);
+    QQmlRefPointer<QQuickCanvasPixmap> loadedPixmap(const QUrl& url, QSizeF sourceSize = QSizeF());
 
     bool isTextureProvider() const override;
     QSGTextureProvider *textureProvider() const override;
@@ -139,7 +138,7 @@ Q_SIGNALS:
     void imageLoaded();
 
 public Q_SLOTS:
-    void loadImage(const QUrl& url);
+    void loadImage(const QUrl& url, QSizeF sourceSize = QSizeF());
     void unloadImage(const QUrl& url);
     bool isImageLoaded(const QUrl& url) const;
     bool isImageLoading(const QUrl& url) const;
@@ -186,6 +185,4 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QQuickCanvasItem)
-
 #endif //QQUICKCANVASITEM_P_H