Merge branch 'jb53656' into 'master'

[systemsettings] Sort permissions by short permission description. Fixes JB#53656

See merge request mer-core/nemo-qml-plugin-systemsettings!171

Author: rainemak

rpm/nemo-qml-plugin-systemsettings.spec

@@ -1,6 +1,6 @@
 Name:       nemo-qml-plugin-systemsettings
 Summary:    System settings plugin for Nemo Mobile
-Version:    0.5.73
+Version:    0.5.75
 Release:    1
 License:    BSD
 URL:        https://git.sailfishos.org/mer-core/nemo-qml-plugin-systemsettings
@@ -13,7 +13,7 @@ Requires:       libsailfishkeyprovider >= 0.0.14
 Requires:       connman-qt5 >= 1.2.38
 Requires:       user-managerd >= 0.4.0
 Requires:       udisks2 >= 2.8.1+git6
-Requires:       mlite-qt5 >= 0.3.3
+Requires:       mlite-qt5 >= 0.3.6
 Requires(post): coreutils
 BuildRequires:  pkgconfig(Qt5Qml)
 BuildRequires:  pkgconfig(Qt5SystemInfo)
@@ -22,7 +22,7 @@ BuildRequires:  pkgconfig(Qt5XmlPatterns)
 BuildRequires:  pkgconfig(timed-qt5)
 BuildRequires:  pkgconfig(profile)
 BuildRequires:  pkgconfig(mce) >= 1.21.0
-BuildRequires:  pkgconfig(mlite5) >= 0.3.3
+BuildRequires:  pkgconfig(mlite5) >= 0.3.6
 BuildRequires:  pkgconfig(usb-moded-qt5)
 BuildRequires:  pkgconfig(blkid)
 BuildRequires:  pkgconfig(libcrypto)

src/permissionsmodel.cpp

@@ -33,6 +33,15 @@
 #include <MPermission>
 #include "permissionsmodel.h"
 
+namespace {
+
+bool permissionLessThan(const MPermission &p1, const MPermission &p2)
+{
+    return (p1.description().localeAwareCompare(p2.description()) < 0);
+}
+
+}
+
 PermissionsModel::PermissionsModel(QObject *parent)
     : QAbstractListModel(parent)
 {
@@ -106,6 +115,7 @@ void PermissionsModel::loadPermissions()
         if (!permissions.isEmpty()) {
             beginInsertRows(QModelIndex(), 0, permissions.length() - 1);
             m_permissions.swap(permissions);
+            std::sort(m_permissions.begin(), m_permissions.end(), permissionLessThan);
             endInsertRows();
         }
     }