From a034dc196ebaf82731a8bbe2bf602c5c527c9f76 Mon Sep 17 00:00:00 2001
From: Damian Jansen <damian.jansen@nokia.com>
Date: Thu, 14 Jun 2012 16:19:02 +1000
Subject: 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>
---
 src/quick/items/qquickborderimage.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/quick/items/qquickborderimage.cpp')

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;
             }
         }
     }
-- 
cgit v1.2.3