summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/declarative/graphicsitems/qdeclarativeimagebase.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase.cpp b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
index 416604b..482906e 100644
--- a/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
@@ -139,9 +139,9 @@ void QDeclarativeImageBase::load()
d->status = Null;
setImplicitWidth(0);
setImplicitHeight(0);
- emit statusChanged(d->status);
d->sourcesize.setWidth(0);
d->sourcesize.setHeight(0);
+ emit statusChanged(d->status);
emit sourceSizeChanged();
pixmapChange();
update();
@@ -182,19 +182,20 @@ void QDeclarativeImageBase::requestFinished()
} else {
d->status = Ready;
}
- emit statusChanged(d->status);
+
+ d->progress = 1.0;
setImplicitWidth(d->pix.width());
setImplicitHeight(d->pix.height());
- d->progress = 1.0;
- emit progressChanged(d->progress);
-
if (d->sourcesize.width() != d->pix.width() || d->sourcesize.height() != d->pix.height()) {
d->sourcesize.setWidth(d->pix.width());
d->sourcesize.setHeight(d->pix.height());
emit sourceSizeChanged();
}
+
+ emit statusChanged(d->status);
+ emit progressChanged(d->progress);
pixmapChange();
update();
}