Get AnimatedImage + autotests working again.

There are still failures, but at least the tests no longer crash.

2 files changed, 11 insertions, 5 deletions

diff --git a/src/declarative/graphicsitems/qmlgraphicsimage.cpp b/src/declarative/graphicsitems/qmlgraphicsimage.cpp
index fd220a3..938fe2a 100644
--- a/src/declarative/graphicsitems/qmlgraphicsimage.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsimage.cpp
@@ -152,12 +152,18 @@ void QmlGraphicsImage::setPixmap(const QPixmap &pix)
     Q_D(QmlGraphicsImage);
     if (!d->url.isEmpty())
         return;
-    d->pix = pix;
+    d->setPixmap(pix);
+}
+
+void QmlGraphicsImagePrivate::setPixmap(const QPixmap &pixmap)
+{
+    Q_Q(QmlGraphicsImage);
+    pix = pixmap;
 
-    setImplicitWidth(d->pix.width());
-    setImplicitHeight(d->pix.height());
+    q->setImplicitWidth(pix.width());
+    q->setImplicitHeight(pix.height());
 
-    update();
+    q->update();
 }
 
 /*!
diff --git a/src/declarative/graphicsitems/qmlgraphicsimage_p_p.h b/src/declarative/graphicsitems/qmlgraphicsimage_p_p.h
index 62a4d1e..f6b4e51 100644
--- a/src/declarative/graphicsitems/qmlgraphicsimage_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsimage_p_p.h
@@ -69,7 +69,7 @@ public:
     }
 
     QmlGraphicsImage::FillMode fillMode;
-
+    void setPixmap(const QPixmap &pix);
 };
 
 QT_END_NAMESPACE