gallery-app

Merge lp://qastaging/~artmello/gallery-app/gallery-app-handle_gif_files into lp://qastaging/gallery-app

  1. gallery-app-handle_gif_files
  2. Merge into trunk
Proposed by Arthur Mello
Status: Merged
Approved by: Bill Filler
Approved revision: 1124
Merged at revision: 1124
Proposed branch: lp://qastaging/~artmello/gallery-app/gallery-app-handle_gif_files
Merge into: lp://qastaging/gallery-app
Diff against target: 78 lines (+14/-7)
4 files modified
rc/qml/MediaViewer/MediaViewer.qml (+1/-0)
src/photo/photo.cpp (+6/-7)
src/photo/photo.h (+2/-0)
tests/unittests/stubs/photo_stub.cpp (+5/-0)
To merge this branch: bzr merge lp://qastaging/~artmello/gallery-app/gallery-app-handle_gif_files
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+244934@code.qastaging.launchpad.net

Commit message

Make gallery display files that are not supported by QImageWriter or that do not have metadata
Disable the editing options for files that are not supported by QImageWriter

Description of the change

Make gallery display files that are not supported by QImageWriter or that do not have metadata
Disable the editing options for files that are not supported by QImageWriter

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

FAILED: Continuous integration, rev:1123
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1086/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/66/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/335/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/98/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/341/console

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

review: Needs Fixing (continuous-integration)
lp://qastaging/~artmello/gallery-app/gallery-app-handle_gif_files updated
1124. By Arthur Mello

Fix stub on unittests

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

FAILED: Continuous integration, rev:1124
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1087/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/15
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/67
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/337/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/706
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/99
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16639
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/277/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/343
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/343/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

approved

review: Approve

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