From 364291fac8385ec318b75b2c19d60f1b3477960e Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Tue, 2 Jul 2019 13:28:21 +0300
Subject: [PATCH] [systemsettings] Expose baseOperatingSystemName that does not
 contain OS suffix. Contributes to JB#46079

---
 src/aboutsettings.cpp | 9 +++++++++
 src/aboutsettings.h   | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/src/aboutsettings.cpp b/src/aboutsettings.cpp
index 0411c23..811e4e7 100644
--- a/src/aboutsettings.cpp
+++ b/src/aboutsettings.cpp
@@ -194,6 +194,15 @@ QString AboutSettings::serial() const
     return QString();
 }
 
+QString AboutSettings::baseOperatingSystemName() const
+{
+    QString osName = operatingSystemName();
+    if (osName.endsWith(QStringLiteral(" OS"))) {
+        osName.chop(3);
+    }
+    return osName;
+}
+
 QString AboutSettings::operatingSystemName() const
 {
     parseReleaseFile(QStringLiteral("/etc/os-release"), &m_osRelease);
diff --git a/src/aboutsettings.h b/src/aboutsettings.h
index 4152730..cac9b90 100644
--- 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 baseOperatingSystemName READ baseOperatingSystemName CONSTANT)
     Q_PROPERTY(QString operatingSystemName READ operatingSystemName CONSTANT)
     Q_PROPERTY(QString softwareVersion READ softwareVersion CONSTANT)
     Q_PROPERTY(QString softwareVersionId READ softwareVersionId CONSTANT)
@@ -80,6 +81,7 @@ class SYSTEMSETTINGS_EXPORT AboutSettings: public QObject
     QString wlanMacAddress() const;
     QString imei() const;
     QString serial() const;
+    QString baseOperatingSystemName() const;
     QString operatingSystemName() const;
     QString softwareVersion() const;
     QString softwareVersionId() const;