Unity

Merge lp:~sergiusens/unity/mock2core into lp:unity/phablet

  1. mock2core
  2. Merge into phablet
Proposed by Sergio Schvezov
Status: Merged
Approved by: Ricardo Salveti
Approved revision: no longer in the source branch.
Merged at revision: 536
Proposed branch: lp:~sergiusens/unity/mock2core
Merge into: lp:unity/phablet
Diff against target: 64 lines (+0/-19)
3 files modified
Applications/applications.js (+0/-16)
Dash/Apps/AppsAvailableForDownloadModel.qml (+0/-2)
Dash/Apps/InstalledApplicationsModel.qml (+0/-1)
To merge this branch: bzr merge lp:~sergiusens/unity/mock2core
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Ricardo Salveti (community) Approve
Review via email: mp+157223@code.launchpad.net

Commit message

Removing mocks for calendar, clock and calculator

Description of the change

Removing mocks for calendar, clock and calculator

Please test the CI output, I'll be doing the same

To post a comment you must log in.
Revision history for this message
Ricardo Salveti (rsalveti) wrote :

LGTM.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:536
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/259/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/260
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/260/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/259
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/135
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/135/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/634

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/259/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Applications/applications.js'
2--- Applications/applications.js 2013-03-27 13:19:33 +0000
3+++ Applications/applications.js 2013-04-04 20:27:22 +0000
4@@ -111,28 +111,12 @@
5 'icon': 'ubuntuone',
6 'exec': '/usr/bin/webbrowser-app --chromeless http://one.ubuntu.com'
7 },
8- '/usr/share/applications/calculator-mockapp.desktop': {
9- 'name': 'Calculator',
10- 'icon': 'calculator',
11- 'exec': '/usr/bin/qmlscene /usr/share/demo-mock-apps/calculator.qml',
12- 'stage': SideStage
13- },
14 '/usr/share/applications/weather-mockapp.desktop': {
15 'name': 'Weather',
16 'icon': 'weather',
17 'exec': '/usr/bin/qmlscene /usr/share/demo-mock-apps/weather.qml',
18 'stage': SideStage
19 },
20- '/usr/share/applications/calendar.desktop': {
21- 'name': 'Calendar',
22- 'icon': 'calendar',
23- 'exec': ''
24- },
25- '/usr/share/applications/clock.desktop': {
26- 'name': 'Clock',
27- 'icon': 'clock',
28- 'exec': ''
29- },
30 '/usr/share/applications/evernote.desktop': {
31 'name': 'Evernote',
32 'icon': 'evernote',
33
34=== modified file 'Dash/Apps/AppsAvailableForDownloadModel.qml'
35--- Dash/Apps/AppsAvailableForDownloadModel.qml 2013-02-26 13:51:48 +0000
36+++ Dash/Apps/AppsAvailableForDownloadModel.qml 2013-04-04 20:27:22 +0000
37@@ -17,8 +17,6 @@
38 import QtQuick 2.0
39
40 ListModel {
41- ListElement { desktopFile: "/usr/share/applications/calendar.desktop"; }
42- ListElement { desktopFile: "/usr/share/applications/clock.desktop"; }
43 ListElement { desktopFile: "/usr/share/applications/evernote.desktop"; }
44 ListElement { desktopFile: "/usr/share/applications/map.desktop"; }
45 ListElement { desktopFile: "/usr/share/applications/pinterest.desktop"; }
46
47=== modified file 'Dash/Apps/InstalledApplicationsModel.qml'
48--- Dash/Apps/InstalledApplicationsModel.qml 2013-03-25 15:19:26 +0000
49+++ Dash/Apps/InstalledApplicationsModel.qml 2013-04-04 20:27:22 +0000
50@@ -18,7 +18,6 @@
51
52 ListModel {
53 ListElement { desktopFile: "/usr/share/applications/amazon-webapp.desktop"; }
54- ListElement { desktopFile: "/usr/share/applications/calculator-mockapp.desktop"; }
55 ListElement { desktopFile: "/usr/share/applications/ebay-webapp.desktop"; }
56 ListElement { desktopFile: "/usr/share/applications/media-player.desktop"; }
57 ListElement { desktopFile: "/usr/share/applications/music-player-mockapp.desktop"; }
58
59=== removed file 'graphics/applicationIcons/calculator@18.png'
60Binary files graphics/applicationIcons/calculator@18.png 2012-12-20 19:56:57 +0000 and graphics/applicationIcons/calculator@18.png 1970-01-01 00:00:00 +0000 differ
61=== removed file 'graphics/applicationIcons/calendar@18.png'
62Binary files graphics/applicationIcons/calendar@18.png 2012-12-21 15:37:19 +0000 and graphics/applicationIcons/calendar@18.png 1970-01-01 00:00:00 +0000 differ
63=== removed file 'graphics/applicationIcons/clock@18.png'
64Binary files graphics/applicationIcons/clock@18.png 2012-12-20 18:13:15 +0000 and graphics/applicationIcons/clock@18.png 1970-01-01 00:00:00 +0000 differ

Subscribers

People subscribed via source and target branches