[SCM] qtdeclarative packaging branch, master, updated. debian/5.6.1-1-13-gf10c113

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 04e4f6b1522347a35278d74ed8a39f2f430cbf3f
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Jun 13 09:49:20 2016 -0300

    Revert "Add qmlplugindump-Don-t-try-to-import-Qt.test.qtestroot.patch (LP: #1473976)"
    
    This reverts commit 3fec796f89cd9321b72b7817a647090d1862c5ca.
---
 debian/changelog                                   |  3 +-
 ...ump-Don-t-try-to-import-Qt.test.qtestroot.patch | 36 ----------------------
 debian/patches/series                              |  3 --
 3 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index da82676..f779d3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
 qtdeclarative-opensource-src (5.5.1-4) UNRELEASED; urgency=medium
 
-  * Add qmlplugindump-Don-t-try-to-import-Qt.test.qtestroot.patch
-    (LP: #1473976)
+  * 
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 17 Feb 2016 10:15:48 +0000
 
diff --git a/debian/patches/qmlplugindump-Don-t-try-to-import-Qt.test.qtestroot.patch b/debian/patches/qmlplugindump-Don-t-try-to-import-Qt.test.qtestroot.patch
deleted file mode 100644
index 14aa147..0000000
--- a/debian/patches/qmlplugindump-Don-t-try-to-import-Qt.test.qtestroot.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7d30fbbf5be3b9a88ed5ab8a1b6c2e6a40f93916 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <albert.astals at canonical.com>
-Date: Thu, 15 Oct 2015 17:26:04 +0200
-Subject: [PATCH] qmlplugindump: Don't try to import Qt.test.qtestroot
-
-Qt.test.qtestroot is only provided by quick_test_main so
-if we find any plugin that tries to inherit from TestCase.qml
-qmlplugindump will fail trying to import this unexistant import
-
-Change-Id: Idee881fa641267a17594dd3c92e929ca3473f3df
----
- tools/qmlplugindump/main.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
-index 0238a4a..5aad160 100644
---- a/tools/qmlplugindump/main.cpp
-+++ b/tools/qmlplugindump/main.cpp
-@@ -838,6 +838,14 @@ static bool getDependencies(const QQmlEngine &engine, const QString &pluginImpor
-         std::cerr << "failed to proecess output of qmlimportscanner" << std::endl;
-         return false;
-     }
-+
-+    QStringList aux;
-+    foreach (const QString &str, *dependencies) {
-+        if (!str.startsWith("Qt.test.qtestroot"))
-+            aux += str;
-+    }
-+    *dependencies = aux;
-+
-     return true;
- }
- 
--- 
-2.5.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 71625f6..9741485 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
-# Backported patches
-qmlplugindump-Don-t-try-to-import-Qt.test.qtestroot.patch
-
 # Debian patches
 check_system_double-conversion.patch

-- 
qtdeclarative packaging