[neon/neon-packaging/plasma-pass/Neon/release] debian/patches: qt5.15 patch from branch

Jonathan Riddell null at kde.org
Mon Nov 9 14:33:31 GMT 2020


Git commit e6bcd1e087ed32587c28b0252c6b5102f8001346 by Jonathan Riddell.
Committed on 09/11/2020 at 14:25.
Pushed by jriddell into branch 'Neon/release'.

qt5.15 patch from branch

A  +22   -0    debian/patches/qt5.15.diff

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

diff --git a/debian/patches/qt5.15.diff b/debian/patches/qt5.15.diff
new file mode 100644
index 0000000..2feecb0
--- /dev/null
+++ b/debian/patches/qt5.15.diff
@@ -0,0 +1,22 @@
+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
+
+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
+ 
+ void PasswordFilterModel::PathFilter::updateParts()
+ {
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
+     mParts = filter.splitRef(QLatin1Char('/'), QString::SkipEmptyParts);
++#else
++    mParts = filter.splitRef(QLatin1Char('/'), Qt::SkipEmptyParts);
++#endif
+ }
+ 
+ PasswordFilterModel::PathFilter::result_type PasswordFilterModel::PathFilter::operator()(const QModelIndex &index) const {



More information about the Neon-commits mailing list