git.iko.soy/unity8
on xenial help sign in
merged with shared
commit8b2d4f1ee507466b8a7acabfc778e8fce64ae6a6 authorNick Dedekind <nick.dedekind@canonical.com> dateTue 7 Oct 2014, 11:56 (12 years ago) parenteedea5487e943f
3 files changed+9−15
compare with xenial
unifiedsplit
tests/mocks/Unity/Indicators/fakeunitymenumodelcache.cpp+1−4 tests/mocks/Unity/Indicators/fakeunitymenumodelcache.h+1−4 tests/qmltests/Panel/tst_IndicatorPage.qml+7−7
tests/mocks/Unity/Indicators/fakeunitymenumodelcache.cpp+1−4
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2013 Canonical Ltd.
2+ * Copyright 2014 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU Lesser General Public License as published by
@@ -12,9 +12,6 @@
1212 *
1313 * You should have received a copy of the GNU Lesser General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors:
17− * Nick Dedekind <nick.dedekind@canonical.com>
1815 */
1916
2017#include "fakeunitymenumodelcache.h"
tests/mocks/Unity/Indicators/fakeunitymenumodelcache.h+1−4
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2013 Canonical Ltd.
2+ * Copyright 2014 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU Lesser General Public License as published by
@@ -12,9 +12,6 @@
1212 *
1313 * You should have received a copy of the GNU Lesser General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors:
17− * Nick Dedekind <nick.dedekind@canonical.com>
1815 */
1916
2017#ifndef FAKEUNITYMENUMODELCACHE_H
tests/qmltests/Panel/tst_IndicatorPage.qml+7−7
@@ -25,7 +25,7 @@ Item {
2525 width: units.gu(40)
2626 height: units.gu(70)
2727
28− IndicatorPage {
28+ IndicatorPage {
2929 id: page
3030 anchors.fill: parent
3131
@@ -109,12 +109,12 @@ Item {
109109 "submenu": []
110110 }]; // end row 1
111111
112− function initializeMenuData(data) {
113− Indicators.UnityMenuModelCache.setCachedModelData("com.canonical.indicator.test",
114− "/com/canonical/indicator/test",
115− "/com/canonical/indicator/test",
116− data);
117− }
112+ function initializeMenuData(data) {
113+ Indicators.UnityMenuModelCache.setCachedModelData("com.canonical.indicator.test",
114+ "/com/canonical/indicator/test",
115+ "/com/canonical/indicator/test",
116+ data);
117+ }
118118
119119 UT.UnityTestCase {
120120 name: "IndicatorPage"