Merge branch 'os_release_name' into 'master'

Provide OS name from os-release See merge request !39
sailfishos · Jan 25, 2018 · 0c30346 · 0c30346
2 parents 813b0e9 + 86a8d8d
commit 0c30346
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/aboutsettings.cpp b/src/aboutsettings.cpp
@@ -178,6 +178,13 @@ QString AboutSettings::serial() const
     }
 }
 
+QString AboutSettings::operatingSystemName() const
+{
+    parseReleaseFile(QStringLiteral("/etc/os-release"), &m_osRelease);
+
+    return m_osRelease["NAME"];
+}
+
 QString AboutSettings::softwareVersion() const
 {
     parseReleaseFile(QStringLiteral("/etc/os-release"), &m_osRelease);

diff --git a/src/aboutsettings.h b/src/aboutsettings.h
@@ -47,6 +47,7 @@ class SYSTEMSETTINGS_EXPORT AboutSettings: public QObject
     Q_PROPERTY(QString wlanMacAddress READ wlanMacAddress CONSTANT)
     Q_PROPERTY(QString imei READ imei CONSTANT)
     Q_PROPERTY(QString serial READ serial CONSTANT)
+    Q_PROPERTY(QString operatingSystemName READ operatingSystemName CONSTANT)
     Q_PROPERTY(QString softwareVersion READ softwareVersion CONSTANT)
     Q_PROPERTY(QString softwareVersionId READ softwareVersionId CONSTANT)
     Q_PROPERTY(QString adaptationVersion READ adaptationVersion CONSTANT)
@@ -79,6 +80,7 @@ class SYSTEMSETTINGS_EXPORT AboutSettings: public QObject
     QString wlanMacAddress() const;
     QString imei() const;
     QString serial() const;
+    QString operatingSystemName() const;
     QString softwareVersion() const;
     QString softwareVersionId() const;
     QString adaptationVersion() const;