[nemo-systemsettings] Add longDescription to PermissionsModel. JB#52386

Signed-off-by: Tomi Leppänen <tomi.leppanen@jolla.com>
sailfishos · Dec 9, 2020 · 6648417 · 6648417
1 parent 76f733f
commit 6648417
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/rpm/nemo-qml-plugin-systemsettings.spec b/rpm/nemo-qml-plugin-systemsettings.spec
@@ -13,7 +13,7 @@ Requires:       libsailfishkeyprovider >= 0.0.14
 Requires:       connman-qt5 >= 1.2.21
 Requires:       user-managerd >= 0.4.0
 Requires:       udisks2 >= 2.8.1+git6
-Requires:       mlite-qt5 >= 0.3.0
+Requires:       mlite-qt5 >= 0.3.3
 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.0
+BuildRequires:  pkgconfig(mlite5) >= 0.3.3
 BuildRequires:  pkgconfig(usb-moded-qt5)
 BuildRequires:  pkgconfig(blkid)
 BuildRequires:  pkgconfig(libcrypto)

diff --git a/src/permissionsmodel.cpp b/src/permissionsmodel.cpp
@@ -62,6 +62,7 @@ QHash<int, QByteArray> PermissionsModel::roleNames() const
     static const QHash<int, QByteArray> roles = {
         { Qt::DisplayRole, "display" },
         { DescriptionRole, "description" },
+        { LongDescriptionRole, "longDescription" },
         { NameRole, "name" },
     };
     return roles;
@@ -82,6 +83,8 @@ QVariant PermissionsModel::data(const QModelIndex &index, int role) const
     case Qt::DisplayRole:
     case DescriptionRole:
         return m_permissions.at(index.row()).description();
+    case LongDescriptionRole:
+        return m_permissions.at(index.row()).longDescription();
     case NameRole:
         return m_permissions.at(index.row()).name();
     default:

diff --git a/src/permissionsmodel.h b/src/permissionsmodel.h
@@ -49,6 +49,7 @@ class SYSTEMSETTINGS_EXPORT PermissionsModel: public QAbstractListModel
 
     enum Roles {
         DescriptionRole = Qt::UserRole,
+        LongDescriptionRole,
         NameRole,
     };