[SCM] qtdeclarative packaging branch, ubuntu, updated. debian/5.4.2-3-6-g3446086

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 3446086c0f61e6057ec411860dccd76471d0c6ef
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Jul 7 11:18:36 2015 +0000

    Fix segfault by importing https://codereview.qt-project.org/#/c/115522/ (LP: #1469611)
---
 debian/changelog                                  | 8 ++++++++
 debian/patches/Add-QQuickAsyncImageProvider.patch | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a2aa914..808c3ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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/
+      (LP: #1469611)
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 07 Jul 2015 11:16:13 +0000
+
 qtdeclarative-opensource-src (5.4.2-1ubuntu1) wily; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/Add-QQuickAsyncImageProvider.patch b/debian/patches/Add-QQuickAsyncImageProvider.patch
index 198d23b..6bcbc0f 100644
--- a/debian/patches/Add-QQuickAsyncImageProvider.patch
+++ b/debian/patches/Add-QQuickAsyncImageProvider.patch
@@ -696,7 +696,7 @@ index 2066d1e..810629c 100644
 +       }
 +        mutex.lock();
 +        if (!cancelled.contains(job))
-+            job->postReply(error, errorString, t->textureSize(), t);
++            job->postReply(error, errorString, t ? t->textureSize() : QSize(), t);
 +        mutex.unlock();
 +    }
 +    response->deleteLater();

-- 
qtdeclarative packaging