[neon/neon-packaging/plasma-pass/Neon/stable] debian/patches: remove patch

Jonathan Riddell null at kde.org
Mon Nov 9 14:55:11 GMT 2020


Git commit 993ba0e8d0ff6131635cdcf7e07428f11485a7dc by Jonathan Riddell.
Committed on 09/11/2020 at 14:54.
Pushed by jriddell into branch 'Neon/stable'.

remove patch

D  +0    -31   debian/patches/qt5.15.diff

https://invent.kde.org/neon/neon-packaging/plasma-pass/commit/993ba0e8d0ff6131635cdcf7e07428f11485a7dc

diff --git a/debian/patches/qt5.15.diff b/debian/patches/qt5.15.diff
deleted file mode 100644
index 3660669..0000000
--- a/debian/patches/qt5.15.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 3fb633159ca4a1db166d5c54bbc025f71aba1652
-Author: Daniel Vrátil <dvratil at kde.org>
-Date:   Thu Apr 9 12:48:53 2020 +0200
-
-    Fix build against Qt 5.15
-
-Index: plasma-pass-1.1.0/plugin/passwordfiltermodel.cpp
-===================================================================
---- plasma-pass-1.1.0.orig/plugin/passwordfiltermodel.cpp
-+++ plasma-pass-1.1.0/plugin/passwordfiltermodel.cpp
-@@ -53,7 +53,7 @@ void PasswordFilterModel::setSourceModel
-     mFlatModel->setSourceModel(sourceModel);
- 
-     if (!this->sourceModel()) {
--        QSortFilterProxyModel::setSourceModel(mFlatModel);
-+      QSortFilterProxyModel::setSourceModel(mFlatModel);
-     }
- }
- 
-@@ -79,7 +79,11 @@ void PasswordFilterModel::delayedUpdateF
-     Q_ASSERT(sender() == &mUpdateTimer);
- 
-     mFilter = mUpdateTimer.property(newFilterProperty).toString();
-+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
-     mParts = mFilter.splitRef(QLatin1Char('/'), QString::SkipEmptyParts);
-+#else
-+    mParts = mfilter.splitRef(QLatin1Char('/'), Qt::SkipEmptyParts);
-+#endif
-     Q_EMIT passwordFilterChanged();
-     mSortingLookup.clear();
-     invalidate();


More information about the Neon-commits mailing list