[SCM] qtdeclarative packaging branch, ubuntu, updated. debian/5.5.0-2-31-gacf4e55

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit acf4e55fe2559818a819db6261d70228ab1bba66
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Sep 9 07:38:13 2015 +0000

    Update Fix-memory-leak-when-QQuickPixmapReply-Event-is-dele.patch to the 5.5 branch version.
---
 .../Fix-memory-leak-when-QQuickPixmapReply-Event-is-dele.patch        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
index e570fc5..70fda3e 100644
--- a/debian/patches/Fix-memory-leak-when-QQuickPixmapReply-Event-is-dele.patch
+++ b/debian/patches/Fix-memory-leak-when-QQuickPixmapReply-Event-is-dele.patch
@@ -25,7 +25,7 @@ index ddf2ae2..a1c9205 100644
 @@ -148,6 +148,7 @@ public:
      class Event : public QEvent {
      public:
-         Event(ReadError, const QString &, const QSize &, QQuickTextureFactory *factory);
+         Event(ReadError, const QString &, const QSize &, AutoTransform, QQuickTextureFactory *factory);
 +        ~Event();
  
          ReadError error;
@@ -48,8 +48,8 @@ index ddf2ae2..a1c9205 100644
                  data->textureFactory = de->textureFactory;
 +                de->textureFactory = 0;
                  data->implicitSize = de->implicitSize;
+                 data->appliedTransform = de->autoTransform;
                  PIXMAP_PROFILE(pixmapLoadingFinished(data->url,
-                         data->textureFactory != 0 && data->textureFactory->textureSize().isValid() ?
 -- 
 2.5.0
 

-- 
qtdeclarative packaging