Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I3c6a93917cb46868cdb9dd50566b90c70f67102e

1 files changed, 15 insertions, 9 deletions

diff --git a/src/quick/items/qquickanimatedimage.cpp b/src/quick/items/qquickanimatedimage.cpp
index 3ae2512c98..ab5170cd65 100644
--- a/src/quick/items/qquickanimatedimage.cpp
+++ b/src/quick/items/qquickanimatedimage.cpp
@@ -300,8 +300,9 @@ void QQuickAnimatedImage::load()
         d->status = Null;
         emit statusChanged(d->status);
 
-        if (sourceSize() != d->oldSourceSize) {
-            d->oldSourceSize = sourceSize();
+        d->currentSourceSize = QSize(0, 0);
+        if (d->currentSourceSize != d->oldSourceSize) {
+            d->oldSourceSize = d->currentSourceSize;
             emit sourceSizeChanged();
         }
         if (isPlaying() != d->oldPlaying)
@@ -372,8 +373,9 @@ void QQuickAnimatedImage::movieRequestFinished()
         d->status = Error;
         emit statusChanged(d->status);
 
-        if (sourceSize() != d->oldSourceSize) {
-            d->oldSourceSize = sourceSize();
+        d->currentSourceSize = QSize(0, 0);
+        if (d->currentSourceSize != d->oldSourceSize) {
+            d->oldSourceSize = d->currentSourceSize;
             emit sourceSizeChanged();
         }
         if (isPlaying() != d->oldPlaying)
@@ -410,8 +412,14 @@ void QQuickAnimatedImage::movieRequestFinished()
 
     if (isPlaying() != d->oldPlaying)
         emit playingChanged();
-    if (sourceSize() != d->oldSourceSize) {
-        d->oldSourceSize = sourceSize();
+
+    if (d->_movie)
+        d->currentSourceSize = d->_movie->currentPixmap().size();
+    else
+        d->currentSourceSize = QSize(0, 0);
+
+    if (d->currentSourceSize != d->oldSourceSize) {
+        d->oldSourceSize = d->currentSourceSize;
         emit sourceSizeChanged();
     }
 }
@@ -464,9 +472,7 @@ void QQuickAnimatedImage::onCacheChanged()
 QSize QQuickAnimatedImage::sourceSize()
 {
     Q_D(QQuickAnimatedImage);
-    if (!d->_movie)
-        return QSize(0, 0);
-    return QSize(d->_movie->currentPixmap().size());
+    return d->currentSourceSize;
 }
 
 void QQuickAnimatedImage::componentComplete()