Code Review / staging / HomeScreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw (from parent 2: 064e77a)
Merge branch 'master' of https://gerrit.automotivelinux.org/gerrit/p/staging/HomeScreen
authorBocklage, Jens <Jens_Bocklage@mentor.com>
Thu, 22 Dec 2016 12:34:02 +0000 (13:34 +0100)
committerBocklage, Jens <Jens_Bocklage@mentor.com>
Thu, 22 Dec 2016 12:34:02 +0000 (13:34 +0100)
Conflicts:
HomeScreen/src/applicationmodel.cpp

HomeScreen/src/applicationmodel.cpp patch | blob | history

diff --git a/HomeScreen/src/applicationmodel.cpp b/HomeScreen/src/applicationmodel.cpp
index 6a8ba60..9869f00 100644 (file)
--- a/HomeScreen/src/applicationmodel.cpp
+++ b/HomeScreen/src/applicationmodel.cpp
@@ -49,7 +49,7 @@ ApplicationModel::Private::Private(ApplicationModel *parent)
         data.append(AppInfo(QStringLiteral("Connectivity"), QStringLiteral("CONNECTIVITY"), QStringLiteral("connectivity@0.1")));
         data.append(AppInfo(QStringLiteral("Dashboard"), QStringLiteral("DASHBOARD"), QStringLiteral("dashboard@0.1")));
         data.append(AppInfo(QStringLiteral("Settings"), QStringLiteral("SETTINGS"), QStringLiteral("settings@0.1")));
-        data.append(AppInfo(QStringLiteral("Mixer"), QStringLiteral("Mixer"), QStringLiteral("mixer@0.1")));
+        data.append(AppInfo(QStringLiteral("Mixer"), QStringLiteral("MIXER"), QStringLiteral("mixer@0.1")));
     }
 }