Improve version information for AGL UCB. 51/13551/1 5.0.2 eel/5.0.2 eel_5.0.2
authorHarunobu Kurokawa <harunobu.kurokawa.dn@renesas.com>
Mon, 5 Mar 2018 06:29:11 +0000 (15:29 +0900)
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>
Mon, 5 Mar 2018 12:55:44 +0000 (12:55 +0000)
Version information is hardcoded. This commit support
AGL UCB version automatically from /etc/os-release

Bug-AGL: SPEC-656

Signed-off-by: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com>
(cherry picked from commit 5d2bb8dd6c20c74d66b320f407dd6221592ee25a)

Change-Id: I3e2ba2abe5312945c567b9f501a2dd4f1f3453ce

app/main.cpp
app/version/Version.qml

index d496ef6..3b0d1e9 100644 (file)
@@ -133,6 +133,17 @@ int main(int argc, char *argv[])
     } else {
         qWarning() << version.errorString();
     }
+
+    QFile aglversion("/etc/os-release");
+    if (aglversion.open(QFile::ReadOnly)) {
+        QStringList data = QString::fromLocal8Bit(aglversion.readAll()).split(QLatin1Char('\n'));
+        QStringList data2 = data.at(2).split(QLatin1Char('"'));
+        engine.rootContext()->setContextProperty("ucb", data2.at(1));
+        aglversion.close();
+    } else {
+        qWarning() << aglversion.errorString();
+    }
+
     DBus dbus;
     engine.rootContext()->setContextProperty("dbus", &dbus);
     engine.load(QUrl(QStringLiteral("qrc:/Settings.qml")));
index 228481f..8d47ad5 100644 (file)
@@ -55,7 +55,7 @@ SettingPage {
                 font.pixelSize: 48
             }
             Label {
-                text: '5.0.0rc2 (Electric Eel)'
+                text: ucb
                 font.pixelSize: 48
                 Layout.fillWidth: true
             }