[SCM] qtdeclarative packaging branch, ubuntu, updated. debian/5.5.1-2-35-ge575c58

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 3ec72d428986525a5016af08fd65d7905b72f73b
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Sun Oct 18 09:44:45 2015 +0000

    Drop upstreamed patches:
    
    * Drop upstreamed patches:
      - debian/patches/Fix-memory-leak-when-QQuickPixmapReply-Event-is-dele.patch
---
 debian/changelog                                   |  2 +
 ...leak-when-QQuickPixmapReply-Event-is-dele.patch | 55 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 56 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 25a4377..7afc45b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ qtdeclarative-opensource-src (5.5.1-2ubuntu1) UNRELEASED; urgency=medium
     - debian/patches/disable_failing_tests.patch
     - debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch
       (LP: #1437320)
+  * Drop upstreamed patches:
+    - debian/patches/Fix-memory-leak-when-QQuickPixmapReply-Event-is-dele.patch
   * Update .install files.
   * Skip tests also on ppc64el, they are flaky.
   * Update symbols and mark/unmark private ones.
diff --git a/debian/patches/Fix-memory-leak-when-QQuickPixmapReply-Event-is-dele.patch b/debian/patches/Fix-memory-leak-when-QQuickPixmapReply-Event-is-dele.patch
deleted file mode 100644
index 70fda3e..0000000
--- a/debian/patches/Fix-memory-leak-when-QQuickPixmapReply-Event-is-dele.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 16916560c13bf4c096461426c37eccbc8841a13c Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <albert.astals at canonical.com>
-Date: Fri, 14 Aug 2015 15:51:43 +0200
-Subject: [PATCH] Fix memory leak when QQuickPixmapReply::Event is delete
- before being used
-
-It can happen that QQuickPixmapReply::postReply is called, and before
-QQuickPixmapReply::event is called the object gets deleted. That means that
-the texture factory will never be deleted.
-
-To fix that we delete it in the destructor of QQuickPixmapReply::Event and set
-it to 0 in QQuickPixmapReply::event after assigning to the next data structure
-that will take care of it
-
-Change-Id: Ibea62f5a10a53cca586de7c5f03f00aabfb88b2e
-Reviewed-by: Robin Burchell <robin.burchell at viroteck.net>
----
- src/quick/util/qquickpixmapcache.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp
-index ddf2ae2..a1c9205 100644
---- a/src/quick/util/qquickpixmapcache.cpp
-+++ b/src/quick/util/qquickpixmapcache.cpp
-@@ -148,6 +148,7 @@ public:
-     class Event : public QEvent {
-     public:
-         Event(ReadError, const QString &, const QSize &, AutoTransform, QQuickTextureFactory *factory);
-+        ~Event();
- 
-         ReadError error;
-         QString errorString;
-@@ -339,6 +340,11 @@ QQuickPixmapReply::Event::Event(ReadError e, const QString &s, const QSize &iSiz
- {
- }
- 
-+QQuickPixmapReply::Event::~Event()
-+{
-+    delete textureFactory;
-+}
-+
- QNetworkAccessManager *QQuickPixmapReader::networkAccessManager()
- {
-     if (!accessManager) {
-@@ -965,6 +971,7 @@ bool QQuickPixmapReply::event(QEvent *event)
-             data->pixmapStatus = (de->error == NoError) ? QQuickPixmap::Ready : QQuickPixmap::Error;
-             if (data->pixmapStatus == QQuickPixmap::Ready) {
-                 data->textureFactory = de->textureFactory;
-+                de->textureFactory = 0;
-                 data->implicitSize = de->implicitSize;
-                 data->appliedTransform = de->autoTransform;
-                 PIXMAP_PROFILE(pixmapLoadingFinished(data->url,
--- 
-2.5.0
-
diff --git a/debian/patches/series b/debian/patches/series
index bd2383c..28e704d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@ Make-sure-we-stop-animators-if-they-are-yet-to-be-st.patch
 Add-QQuickAsyncImageProvider.patch
 Don-t-change-the-currentItem-after-a-viewport-resize.patch
 Fix-memory-leak-when-using-async-image-providers.patch
-Fix-memory-leak-when-QQuickPixmapReply-Event-is-dele.patch
 
 # Debian patches
 check_system_double-conversion.patch

-- 
qtdeclarative packaging