Ubuntu UI Toolkit

Merge lp://qastaging/~larsu/ubuntu-ui-toolkit/support-usr-share-pixmaps into lp://qastaging/ubuntu-ui-toolkit/staging

  1. support-usr-share-pixmaps
  2. Merge into staging
Proposed by Lars Karlitski
Status: Work in progress
Proposed branch: lp://qastaging/~larsu/ubuntu-ui-toolkit/support-usr-share-pixmaps
Merge into: lp://qastaging/ubuntu-ui-toolkit/staging
Diff against target: 40 lines (+13/-7)
1 file modified
modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp (+13/-7)
To merge this branch: bzr merge lp://qastaging/~larsu/ubuntu-ui-toolkit/support-usr-share-pixmaps
Reviewer Review Type Date Requested Status
Zsombor Egri Needs Fixing
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+233694@code.qastaging.launchpad.net

Commit message

unitythemeiconprovider: support icons in /usr/share/pixmaps and .xpm

Description of the change

unitythemeiconprovider: support icons in /usr/share/pixmaps and .xpm

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

FAILED: Continuous integration, rev:1241
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1005/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4596
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/837
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/837
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/837/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/837
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4378
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5848
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5848/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12865

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1005/rebuild

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Zsombor Egri (zsombi) wrote :

Could we get a unit test for this? Thank you.

review: Needs Fixing
Reply

Unmerged revisions

1241. By Lars Karlitski

unitythemeiconprovider: support icons in /usr/share/pixmaps and .xpm

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches