aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickborderimage.cpp
diff options
context:
space:
mode:
authorDamian Jansen <damian.jansen@nokia.com>2012-06-14 16:19:02 +1000
committerQt by Nokia <qt-info@nokia.com>2012-06-25 08:59:12 +0200
commita034dc196ebaf82731a8bbe2bf602c5c527c9f76 (patch)
tree63d8c7f66683ffa394cbb57a818c64f8dc8341f7 /src/quick/items/qquickborderimage.cpp
parentd8dcb8ea98f117bb07e866a3ce7fd3c30243e346 (diff)
Remove superfluous statusChanged signal
If the file name is empty, or is a local file, statusChanged would be emitted twice. Task-number: QTBUG-26155 Change-Id: Id341d1c76d45e3fca19260293f632b0b51a34e90 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/quick/items/qquickborderimage.cpp')
-rw-r--r--src/quick/items/qquickborderimage.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp
index 5d4ce7f494..87d423f320 100644
--- a/src/quick/items/qquickborderimage.cpp
+++ b/src/quick/items/qquickborderimage.cpp
@@ -305,6 +305,7 @@ void QQuickBorderImage::load()
setImplicitSize(0, 0);
emit statusChanged(d->status);
update();
+ return;
} else {
d->status = Loading;
if (d->url.path().endsWith(QLatin1String("sci"))) {
@@ -347,6 +348,7 @@ void QQuickBorderImage::load()
emit statusChanged(d->status);
emit progressChanged(d->progress);
update();
+ return;
}
}
}