[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=e575c58

The following commit has been merged in the ubuntu branch:
commit e575c587b0a9cf855d8c5498f610bec4ca40c1d3
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Oct 21 10:25:35 2015 +0000

    Add qmlplugindump-Don-t-try-to-import-Qt.test.qtestroot.patch (LP: #1473976)
---
 debian/changelog                                   |  2 ++
 ...ump-Don-t-try-to-import-Qt.test.qtestroot.patch | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7afc45b..9f35413 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ qtdeclarative-opensource-src (5.5.1-2ubuntu1) UNRELEASED; urgency=medium
   * Bump build dependencies.
   * Build dep on libqt5xcbqpa5 to be able to run the tests under xvfb.
   * Update Vcs url:s to Debian git.
+  * Add qmlplugindump-Don-t-try-to-import-Qt.test.qtestroot.patch
+    (LP: #1473976)
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Thu, 09 Jul 2015 11:02:34 +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
new file mode 100644
index 0000000..14aa147
--- /dev/null
+++ b/debian/patches/qmlplugindump-Don-t-try-to-import-Qt.test.qtestroot.patch
@@ -0,0 +1,36 @@
+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 28e704d..0037ba8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@ 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
+qmlplugindump-Don-t-try-to-import-Qt.test.qtestroot.patch
 
 # Debian patches
 check_system_double-conversion.patch

-- 
qtdeclarative packaging