Merge lp://staging/~jamesh/thumbnailer/no-fallback-albumart into lp://staging/thumbnailer
Proposed by
James Henstridge
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Michi Henning | ||||
Approved revision: | 99 | ||||
Merged at revision: | 136 | ||||
Proposed branch: | lp://staging/~jamesh/thumbnailer/no-fallback-albumart | ||||
Merge into: | lp://staging/thumbnailer | ||||
Diff against target: |
606 lines (+152/-134) 19 files modified
data/CMakeLists.txt (+0/-8) data/thumbnailer.in (+1/-6) debian/control (+2/-11) debian/thumbnailer-common.install (+0/-2) debian/thumbnailer-service.install (+1/-0) plugins/Ubuntu/Thumbnailer.0.1/albumartgenerator.cpp (+3/-11) plugins/Ubuntu/Thumbnailer.0.1/artistartgenerator.cpp (+3/-11) plugins/Ubuntu/Thumbnailer.0.1/thumbnailerimageresponse.cpp (+13/-19) plugins/Ubuntu/Thumbnailer.0.1/thumbnailerimageresponse.h (+4/-10) plugins/Ubuntu/Thumbnailer.0.1/thumbnailgenerator.cpp (+2/-29) tests/image-provider/image-provider_test.cpp (+82/-0) tests/qml/CMakeLists.txt (+4/-0) tests/qml/Fixture.qml (+8/-10) tests/qml/tst_albumart.qml (+13/-14) tests/qml/tst_photo.qml (+1/-1) tests/testsetup.h.in (+0/-1) tests/utils/artserver.cpp (+0/-1) tests/utils/testutils.cpp (+11/-0) tests/utils/testutils.h (+4/-0) |
||||
To merge this branch: | bzr merge lp://staging/~jamesh/thumbnailer/no-fallback-albumart | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michi Henning (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email:
|
Commit message
When a thumbnail can not be loaded, return an error from the image provider rather than substituting in a fallback image. Users can detect the problem via the status property of the QML Image component and provide their own fallback handling.
Description of the change
Direct merge to trunk, to go through CI Train. Branch was reviewed at:
https:/
To post a comment you must log in.
PASSED: Continuous integration, rev:99 jenkins. qa.ubuntu. com/job/ thumbnailer- ci/232/ jenkins. qa.ubuntu. com/job/ thumbnailer- vivid-amd64- ci/119 jenkins. qa.ubuntu. com/job/ thumbnailer- vivid-armhf- ci/118 jenkins. qa.ubuntu. com/job/ thumbnailer- vivid-armhf- ci/118/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ thumbnailer- vivid-i386- ci/114 jenkins. qa.ubuntu. com/job/ thumbnailer- xenial- amd64-ci/ 28 jenkins. qa.ubuntu. com/job/ thumbnailer- xenial- armhf-ci/ 29 jenkins. qa.ubuntu. com/job/ thumbnailer- xenial- armhf-ci/ 29/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ thumbnailer- xenial- i386-ci/ 28
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/thumbnailer -ci/232/ rebuild
http://