[SCM] qtdeclarative packaging branch, ubuntu, updated. ubuntu/5.4.2-1ubuntu1-3-gf5541f1

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=515496f

The following commit has been merged in the ubuntu branch:
commit 515496f17dea68ec4a7853706c3e34ca4dd1b0a8
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Jul 7 11:52:07 2015 +0000

    Import also https://codereview.qt-project.org/#/c/120638/
---
 debian/changelog                                  | 3 ++-
 debian/patches/Add-QQuickAsyncImageProvider.patch | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 808c3ef..60bdb95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,10 @@ qtdeclarative-opensource-src (5.4.2-1ubuntu2) UNRELEASED; urgency=medium
 
   * debian/patches/Add-QQuickAsyncImageProvider.patch:
     - Fix segfault by importing https://codereview.qt-project.org/#/c/115522/
+      and https://codereview.qt-project.org/#/c/120638/
       (LP: #1469611)
 
- -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 07 Jul 2015 11:16:13 +0000
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 07 Jul 2015 11:51:53 +0000
 
 qtdeclarative-opensource-src (5.4.2-1ubuntu1) wily; urgency=medium
 
diff --git a/debian/patches/Add-QQuickAsyncImageProvider.patch b/debian/patches/Add-QQuickAsyncImageProvider.patch
index 6bcbc0f..30496a2 100644
--- a/debian/patches/Add-QQuickAsyncImageProvider.patch
+++ b/debian/patches/Add-QQuickAsyncImageProvider.patch
@@ -675,7 +675,7 @@ index 2066d1e..810629c 100644
          mutex.unlock();
      }
      reply->deleteLater();
-@@ -487,6 +479,32 @@ void QQuickPixmapReader::networkRequestDone(QNetworkReply *reply)
+@@ -487,6 +479,34 @@ void QQuickPixmapReader::networkRequestDone(QNetworkReply *reply)
      threadObject->processJobs();
  }
  
@@ -697,6 +697,8 @@ index 2066d1e..810629c 100644
 +        mutex.lock();
 +        if (!cancelled.contains(job))
 +            job->postReply(error, errorString, t ? t->textureSize() : QSize(), t);
++        else
++            delete t;
 +        mutex.unlock();
 +    }
 +    response->deleteLater();

-- 
qtdeclarative packaging