Merge ~gsilvapt/kubuntu-packaging/+git/dolphin:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/dolphin:kubuntu_unstable

[Gustavo Silva]

Remove upstream patch that was causing build failures.

Unmerged commits

fe3e4bb... by Gustavo Silva on 2017-06-16

Remove patch that was causing build failures in KCI

diff --git a/debian/patches/series b/debian/patches/series
index dd0827a..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-upstream_fix_kfileitemmodel_test.diff
diff --git a/debian/patches/upstream_fix_kfileitemmodel_test.diff b/debian/patches/upstream_fix_kfileitemmodel_test.diff
 deleted file mode 100644
index 0f039c8..0000000
--- a/debian/patches/upstream_fix_kfileitemmodel_test.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From f6095c86c17be60e7f3b3ce1e02b40777600725e Mon Sep 17 00:00:00 2001
-From: Elvis Angelaccio <[e-mail]>
-Date: Wed, 10 May 2017 12:19:12 +0200
-Subject: Fix kfileitemmodeltest
-
-Commit 6dcbb8127c introduced the isHidden role, update the test
-accordingly.
----
- src/tests/kfileitemmodeltest.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/tests/kfileitemmodeltest.cpp b/src/tests/kfileitemmodeltest.cpp
-index 59ff630..b8e0895 100644
---- a/src/tests/kfileitemmodeltest.cpp
-+++ b/src/tests/kfileitemmodeltest.cpp
-@@ -135,10 +135,11 @@ void KFileItemModelTest::cleanup()
- void KFileItemModelTest::testDefaultRoles()
- {
-     const QSet<QByteArray> roles = m_model->roles();
--    QCOMPARE(roles.count(), 3);
-+    QCOMPARE(roles.count(), 4);
-     QVERIFY(roles.contains("text"));
-     QVERIFY(roles.contains("isDir"));
-     QVERIFY(roles.contains("isLink"));
-+    QVERIFY(roles.contains("isHidden"));
- }
- 
- void KFileItemModelTest::testDefaultSortRole()
--- 
-cgit v0.11.2
-