[patch] patch I'm using (manually modified from a straight commit revert)

kde-plasma.milou.r7ae94bb27.patch (text/plain), 1.88 KB, created by Duncan on 2019-12-18 07:28:37 UTC

/p/src/git3-src/milou.git
git show --color=auto --patch-with-stat --decorate --abbrev-commit 7ae94bb27 -R
commit 7ae94bb27 (refs/git-r3/kde-plasma/milou/5/__old__, refs/git-r3/kde-plasma/milou/5/__main__)
Author: Laurent Montel <[e-mail]>
Date:   Fri Sep 20 07:54:09 2019 +0200

    Make it compile without deprecated method

    JED: reverts
    JED: also add include(KDEClangFormat) context line to CMakeLists.txt, later change
---
 CMakeLists.txt       | 4 +---
 lib/sourcesmodel.cpp | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git b/CMakeLists.txt a/CMakeLists.txt
index befc132a5..8ba35a934 100644
--- b/CMakeLists.txt
+++ a/CMakeLists.txt
@@ -19,10 +19,8 @@ include(KDECMakeSettings)
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(ECMAddTests)
 include(GenerateExportHeader)
 include(KDEClangFormat)
-if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
-   add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
-endif()
+
 # find_package(KdepimLibs)
 # set_package_properties(KdepimLibs PROPERTIES DESCRIPTION "KDE PIM Libraries"
 #                        URL "http://www.kde.org"
diff --git b/lib/sourcesmodel.cpp a/lib/sourcesmodel.cpp
index 34f261f51..82f52e737 100644
--- b/lib/sourcesmodel.cpp
+++ a/lib/sourcesmodel.cpp
@@ -261,7 +261,7 @@ void SourcesModel::slotMatchesChanged(const QList<Plasma::QueryMatch>& l)
     m_duplicates.clear();
 
     QList<Plasma::QueryMatch> list(l);
-    std::sort(list.begin(), list.end());
+    qSort(list);
 
     for (auto it = list.crbegin(), end = list.crend(); it != end; ++it) {
         slotMatchAdded(*it);
@@ -308,7 +308,7 @@ void SourcesModel::slotMatchesChanged(const QList<Plasma::QueryMatch>& l)
             return lHigher;
         }
     };
-    std::stable_sort(m_types.begin(), m_types.end(), sortFunc);
+    qStableSort(m_types.begin(), m_types.end(), sortFunc);
 
     m_modelPopulated = true;
     endResetModel();