webbrowser-app

Merge lp:~osomon/webbrowser-app/multi-select-close-icon into lp:webbrowser-app

  1. multi-select-close-icon
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 1084
Merged at revision: 1109
Proposed branch: lp:~osomon/webbrowser-app/multi-select-close-icon
Merge into: lp:webbrowser-app
Diff against target: 12 lines (+1/-1)
1 file modified
src/app/webbrowser/HistoryView.qml (+1/-1)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/multi-select-close-icon
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Riccardo Padovani (community) Approve
Ubuntu Phablet Team Pending
Review via email: mp+263886@code.launchpad.net

Commit message

Update icon, per UI specification.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1084
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1965/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3376
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/722
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/722
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/722/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/722/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2815
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3374
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3374/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21666

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1965/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

lgtm

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

PASSED: Continuous integration, rev:1084
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2005/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3493
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/759
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/759
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/759/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/759
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2905
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3490
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3490/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22192

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2005/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 'src/app/webbrowser/HistoryView.qml'
2--- src/app/webbrowser/HistoryView.qml 2015-06-02 14:24:07 +0000
3+++ src/app/webbrowser/HistoryView.qml 2015-07-06 10:59:19 +0000
4@@ -161,7 +161,7 @@
5 }
6
7 ToolbarAction {
8- iconName: "back"
9+ iconName: "close"
10 text: i18n.tr("Cancel")
11
12 MouseArea {

Subscribers

People subscribed via source and target branches

to status/vote changes: