Merge remote-tracking branch 'origin/dev' into wip/qt6wip/qt6

Conflicts:
	.qmake.conf
	src/qml/qml/qqmlengine.cpp
	src/qmlmodels/qqmlmodelsmodule.cpp

Change-Id: Id60420f8250a9c97fcfe56d4eea19b62c6870404

1 files changed, 39 insertions, 3 deletions

diff --git a/src/quick/items/qquickimagebase.cpp b/src/quick/items/qquickimagebase.cpp
index 729d326625..8bab14bfd1 100644
--- a/src/quick/items/qquickimagebase.cpp
+++ b/src/quick/items/qquickimagebase.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 // if they're not happy with our implementation of it.
 bool QQuickImageBasePrivate::updateDevicePixelRatio(qreal targetDevicePixelRatio)
 {
-    // QQuickImageProvider and SVG can generate a high resolution image when
+    // QQuickImageProvider and SVG and PDF can generate a high resolution image when
     // sourceSize is set (this function is only called if it's set).
     // If sourceSize is not set then the provider default size will be used, as usual.
     bool setDevicePixelRatio = false;
@@ -64,7 +64,8 @@ bool QQuickImageBasePrivate::updateDevicePixelRatio(qreal targetDevicePixelRatio
     } else {
         QString stringUrl = url.path(QUrl::PrettyDecoded);
         if (stringUrl.endsWith(QLatin1String("svg")) ||
-            stringUrl.endsWith(QLatin1String("svgz"))) {
+            stringUrl.endsWith(QLatin1String("svgz")) ||
+            stringUrl.endsWith(QLatin1String("pdf"))) {
             setDevicePixelRatio = true;
         }
     }
@@ -210,6 +211,36 @@ bool QQuickImageBase::mirror() const
     return d->mirror;
 }
 
+void QQuickImageBase::setCurrentFrame(int frame)
+{
+    Q_D(QQuickImageBase);
+    if (frame == d->currentFrame || frame < 0 || (isComponentComplete() && frame >= d->pix.frameCount()))
+        return;
+
+    d->currentFrame = frame;
+
+    if (isComponentComplete()) {
+        if (frame > 0)
+            d->cache = false;
+        load();
+        update();
+    }
+
+    emit currentFrameChanged();
+}
+
+int QQuickImageBase::currentFrame() const
+{
+    Q_D(const QQuickImageBase);
+    return d->currentFrame;
+}
+
+int QQuickImageBase::frameCount() const
+{
+    Q_D(const QQuickImageBase);
+    return d->frameCount;
+}
+
 void QQuickImageBase::load()
 {
     Q_D(QQuickImageBase);
@@ -260,7 +291,7 @@ void QQuickImageBase::load()
             resolve2xLocalFile(d->url, targetDevicePixelRatio, &loadUrl, &d->devicePixelRatio);
         }
 
-        d->pix.load(qmlEngine(this), loadUrl, d->sourcesize * d->devicePixelRatio, options, d->providerOptions);
+        d->pix.load(qmlEngine(this), loadUrl, d->sourcesize * d->devicePixelRatio, options, d->providerOptions, d->currentFrame, d->frameCount);
 
         if (d->pix.isLoading()) {
             if (d->progress != 0.0) {
@@ -319,6 +350,11 @@ void QQuickImageBase::requestFinished()
         d->oldAutoTransform = autoTransform();
         emitAutoTransformBaseChanged();
     }
+    if (d->frameCount != d->pix.frameCount()) {
+        d->frameCount = d->pix.frameCount();
+        emit frameCountChanged();
+    }
+
     update();
 }