[neon/neon-packaging/plasma-pass/Neon/release-lts] debian/patches: refresh patch

Jonathan Riddell null at kde.org
Mon Nov 9 14:54:21 GMT 2020


Git commit 1e9a2a896c446ad8fc4e4d74c72fdaa6632f1b6f by Jonathan Riddell.
Committed on 09/11/2020 at 14:54.
Pushed by jriddell into branch 'Neon/release-lts'.

refresh patch

M  +21   -12   debian/patches/qt5.15.diff

https://invent.kde.org/neon/neon-packaging/plasma-pass/commit/1e9a2a896c446ad8fc4e4d74c72fdaa6632f1b6f

diff --git a/debian/patches/qt5.15.diff b/debian/patches/qt5.15.diff
index 2feecb0..3660669 100644
--- a/debian/patches/qt5.15.diff
+++ b/debian/patches/qt5.15.diff
@@ -4,19 +4,28 @@ Date:   Thu Apr 9 12:48:53 2020 +0200
 
     Fix build against Qt 5.15
 
-diff --git a/plugin/passwordfiltermodel.cpp b/plugin/passwordfiltermodel.cpp
-index e815797..2d323ad 100644
---- a/plugin/passwordfiltermodel.cpp
-+++ b/plugin/passwordfiltermodel.cpp
-@@ -131,7 +131,11 @@ PasswordFilterModel::PathFilter &PasswordFilterModel::PathFilter::operator=(Path
+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);
  
- void PasswordFilterModel::PathFilter::updateParts()
- {
+     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 = filter.splitRef(QLatin1Char('/'), QString::SkipEmptyParts);
+     mParts = mFilter.splitRef(QLatin1Char('/'), QString::SkipEmptyParts);
 +#else
-+    mParts = filter.splitRef(QLatin1Char('/'), Qt::SkipEmptyParts);
++    mParts = mfilter.splitRef(QLatin1Char('/'), Qt::SkipEmptyParts);
 +#endif
- }
- 
- PasswordFilterModel::PathFilter::result_type PasswordFilterModel::PathFilter::operator()(const QModelIndex &index) const {
+     Q_EMIT passwordFilterChanged();
+     mSortingLookup.clear();
+     invalidate();


More information about the Neon-commits mailing list