Add Image auto test

Also fix qmlpixmapcache error reporting and Image and BorderImage
progress reporting for null images.

1 files changed, 12 insertions, 9 deletions

diff --git a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
index 0b57540..3e86a7c 100644
--- a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
@@ -108,16 +108,15 @@ void QmlGraphicsImageBase::setSource(const QUrl &url)
     if (url.isEmpty()) {
         d->pix = QPixmap();
         d->status = Null;
-        d->progress = 1.0;
         setImplicitWidth(0);
         setImplicitHeight(0);
         emit statusChanged(d->status);
         emit sourceChanged(d->url);
-        emit progressChanged(1.0);
         update();
     } else {
         d->status = Loading;
-        QNetworkReply *reply = QmlPixmapCache::get(qmlEngine(this), d->url, &d->pix);
+        bool ok = true;
+        QNetworkReply *reply = QmlPixmapCache::get(qmlEngine(this), d->url, &d->pix, &ok);
         if (reply) {
             d->pendingPixmapCache = true;
             connect(reply, SIGNAL(finished()), this, SLOT(requestFinished()));
@@ -125,15 +124,19 @@ void QmlGraphicsImageBase::setSource(const QUrl &url)
                     this, SLOT(requestProgress(qint64,qint64)));
         } else {
             //### should be unified with requestFinished
-            setImplicitWidth(d->pix.width());
-            setImplicitHeight(d->pix.height());
-
-            if (d->status == Loading)
-                d->status = Ready;
+            if (ok) {
+                setImplicitWidth(d->pix.width());
+                setImplicitHeight(d->pix.height());
+
+                if (d->status == Loading)
+                    d->status = Ready;
+            } else {
+                d->status = Error;
+            }
             d->progress = 1.0;
             emit statusChanged(d->status);
             emit sourceChanged(d->url);
-            emit progressChanged(1.0);
+            emit progressChanged(d->progress);
             update();
         }
     }