[SCM] qtdeclarative packaging branch, ubuntu, updated. ubuntu/5.4.2-1ubuntu2-9-gaedf5c4

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit d98aa80174cf0945bac08d4ec7ce8efe798c08e1
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Thu Jul 9 11:06:13 2015 +0000

    Remove patches no longer needed.
---
 debian/changelog                                   |   5 +
 ...gh-dpi-SVG-and-QQuickImageProvider-Images.patch | 421 ---------------------
 debian/patches/aarch64.patch                       |  19 -
 .../patches/check_system_double-conversion.patch   | 126 ------
 debian/patches/ppc64el.patch                       |  24 --
 5 files changed, 5 insertions(+), 590 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f24c22d..b7da4f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 qtdeclarative-opensource-src (5.5.0-0ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Remove patches no longer needed:
+    - debian/patches/High-dpi-SVG-and-QQuickImageProvider-Images.patch
+    - debian/patches/aarch64.patch
+    - debian/patches/check_system_double-conversion.patch
+    - debian/patches/ppc64el.patch
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Thu, 09 Jul 2015 11:02:34 +0000
 
diff --git a/debian/patches/High-dpi-SVG-and-QQuickImageProvider-Images.patch b/debian/patches/High-dpi-SVG-and-QQuickImageProvider-Images.patch
deleted file mode 100644
index a607d05..0000000
--- a/debian/patches/High-dpi-SVG-and-QQuickImageProvider-Images.patch
+++ /dev/null
@@ -1,421 +0,0 @@
-From 428b92583ee2102c7ef16776a9b7785df7ff4e2c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig at digia.com>
-Date: Thu, 15 Jan 2015 13:38:40 +0100
-Subject: [PATCH] High-dpi SVG and QQuickImageProvider Images
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Scale sourceSize by the target devicePixelRatio before
-passing it to the providers.
-
-Task-number: QTBUG-38127
-Task-number: QTBUG-38991
-Change-Id: I1746e0859b4e63eb0d28d1a1c8aac610b68a9eb9
-Reviewed-by: Jocelyn Turcotte <jturcotte at woboq.com>
-Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart at woboq.com>
-Reviewed-by: Morten Johan Sørvig <morten.sorvig at theqtcompany.com>
----
- src/quick/items/qquickimagebase.cpp       |  14 ++++-
- tests/manual/highdpi/ImageProvider/qmldir |   1 +
- tests/manual/highdpi/heart.svg            |  55 ++++++++++++++++
- tests/manual/highdpi/highdpi.pro          |  13 ++++
- tests/manual/highdpi/highdpi.qmlproject   |  14 +++++
- tests/manual/highdpi/imageprovider.cpp    | 101 ++++++++++++++++++++++++++++++
- tests/manual/highdpi/imageprovider.qml    |  59 +++++++++++++++++
- tests/manual/highdpi/svg.qml              |  73 +++++++++++++++++++++
- 8 files changed, 329 insertions(+), 1 deletion(-)
- create mode 100644 tests/manual/highdpi/ImageProvider/qmldir
- create mode 100644 tests/manual/highdpi/heart.svg
- create mode 100644 tests/manual/highdpi/highdpi.pro
- create mode 100644 tests/manual/highdpi/highdpi.qmlproject
- create mode 100644 tests/manual/highdpi/imageprovider.cpp
- create mode 100644 tests/manual/highdpi/imageprovider.qml
- create mode 100644 tests/manual/highdpi/svg.qml
-
-diff --git a/src/quick/items/qquickimagebase.cpp b/src/quick/items/qquickimagebase.cpp
-index c82b019..688cf57 100644
---- a/src/quick/items/qquickimagebase.cpp
-+++ b/src/quick/items/qquickimagebase.cpp
-@@ -209,7 +209,19 @@ void QQuickImageBase::load()
-         d->devicePixelRatio = 1.0;
- 
-         QUrl loadUrl = d->url;
--        resolve2xLocalFile(d->url, targetDevicePixelRatio, &loadUrl, &d->devicePixelRatio);
-+        if (d->url.scheme() == QStringLiteral("image")
-+            || d->url.toString().endsWith(".svg") || d->url.toString().endsWith(".svgz")) {
-+            // QQuickImageProvider and SVG can generate a high resolution image when
-+            // sourceSize is set. If sourceSize is not set then the provider default size
-+            // will be used, as usual.
-+            if (d->sourcesize.isValid())
-+                d->devicePixelRatio = targetDevicePixelRatio;
-+        } else {
-+            // (possible) local file: loadUrl and d->devicePixelRatio will be modified if
-+            // an "@2x" file is found.
-+            resolve2xLocalFile(d->url, targetDevicePixelRatio, &loadUrl, &d->devicePixelRatio);
-+        }
-+
-         d->pix.load(qmlEngine(this), loadUrl, d->sourcesize * d->devicePixelRatio, options);
- 
-         if (d->pix.isLoading()) {
-diff --git a/tests/manual/highdpi/ImageProvider/qmldir b/tests/manual/highdpi/ImageProvider/qmldir
-new file mode 100644
-index 0000000..add39d4
---- /dev/null
-+++ b/tests/manual/highdpi/ImageProvider/qmldir
-@@ -0,0 +1 @@
-+plugin qmlimageproviderplugin
-diff --git a/tests/manual/highdpi/heart.svg b/tests/manual/highdpi/heart.svg
-new file mode 100644
-index 0000000..8c982cd
---- /dev/null
-+++ b/tests/manual/highdpi/heart.svg
-@@ -0,0 +1,55 @@
-+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-+<!-- Created with Inkscape (http://www.inkscape.org/) --><svg viewBox="100 200 550 500" height="841.88976pt" id="svg1" inkscape:version="0.40+cvs" sodipodi:docbase="C:\Documents and Settings\Jon Phillips\My Documents\projects
-- 
qtdeclarative packaging