Merge remote-tracking branch 'upstream/master' into tama

sailfishos-sony-tama · May 13, 2021 · 2860e4e · 2860e4e
2 parents a3553f2 + 831cd65
commit 2860e4e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/rpm/nemo-qml-plugin-systemsettings.spec b/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)

diff --git a/src/aboutsettings.cpp b/src/aboutsettings.cpp
@@ -232,6 +232,8 @@ QString AboutSettings::serial() const
         // node or something for it. The means how the serialnumber ends to 
         // this file are device specific.
         << "/run/config/serial"
+        // usb-moded sets up the serial number here.
+        << "/sys/class/android_usb/android0/iSerial"
         // Some devices have serialno in this path.
         << "/sys/firmware/devicetree/base/firmware/android/serialno";
 

diff --git a/src/permissionsmodel.cpp b/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();
         }
     }