Merge lp://qastaging/~artmello/gallery-app/gallery-app-handle_svg_files into lp://qastaging/gallery-app
Proposed by
Arthur Mello
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Ugo Riboni | ||||||||
Approved revision: | 1242 | ||||||||
Merged at revision: | 1236 | ||||||||
Proposed branch: | lp://qastaging/~artmello/gallery-app/gallery-app-handle_svg_files | ||||||||
Merge into: | lp://qastaging/gallery-app | ||||||||
Diff against target: |
519 lines (+329/-41) 7 files modified
debian/control (+1/-0) src/media-object-factory.cpp (+21/-13) tests/unittests/mediaobjectfactory/CMakeLists.txt (+3/-12) tests/unittests/mediaobjectfactory/data/sample02.svg (+295/-0) tests/unittests/mediaobjectfactory/tst_mediaobjectfactory.cpp (+9/-9) tests/unittests/stubs/photo_stub.cpp (+0/-6) tests/unittests/stubs/video_stub.cpp (+0/-1) |
||||||||
To merge this branch: | bzr merge lp://qastaging/~artmello/gallery-app/gallery-app-handle_svg_files | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ugo Riboni (community) | Approve | ||
PS Jenkins bot | continuous-integration | Needs Fixing | |
Review via email: mp+267972@code.qastaging.launchpad.net |
Commit message
Do not ignore file if gallery is not able to read its metadata.
Add libqt5svg5 as build dep to run unittests.
Description of the change
Do not ignore file if gallery is not able to read its metadata
To post a comment you must log in.
FAILED: Continuous integration, rev:1234 jenkins. qa.ubuntu. com/job/ gallery- app-ci/ 1174/ jenkins. qa.ubuntu. com/job/ gallery- app-vivid- amd64-ci/ 102 jenkins. qa.ubuntu. com/job/ gallery- app-vivid- armhf-ci/ 102 jenkins. qa.ubuntu. com/job/ gallery- app-vivid- armhf-ci/ 102/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ gallery- app-vivid- i386-ci/ 102 jenkins. qa.ubuntu. com/job/ generic- click-autopilot -vivid- touch/255 jenkins. qa.ubuntu. com/job/ generic- click-autopilot -runner- mako/907 jenkins. qa.ubuntu. com/job/ generic- click-builder- vivid-armhf/ 721 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 22543
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/gallery- app-ci/ 1174/rebuild
http://