lp:~jamesh/thumbnailer/no-fallback-albumart

Branch merges

Merged into lp:thumbnailer at revision 136

Michi Henning (community): Approve on 2016-02-05

PS Jenkins bot: Approve (continuous-integration) on 2016-02-05

Diff: 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)

api

Merged into lp:thumbnailer/devel at revision 343

Michi Henning (community): Approve on 2016-01-13

PS Jenkins bot: Approve (continuous-integration) on 2016-01-12

James Henstridge: Pending requested 2015-06-29

Diff: 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)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1324142: Support providing fallback images

Undecided

Fix Released

Link a bug report

Related blueprints

99. By James Henstridge on 2016-01-12

Remove error logging in requestFinished() method.

We now expose the error message via the errorString() method, which Qt
itself will log.

98. By James Henstridge on 2016-01-12

Remove obsolete comment from textureFactory() method.

97. By James Henstridge on 2016-01-12

Add direct image provider tests for error conditions.

96. By James Henstridge on 2016-01-12

Fix up QML tests.

95. By James Henstridge on 2016-01-11

Merge from devel, fixing massive conflicts.

94. By James Henstridge on 2015-07-17

Remove the thumbnailer-common binary package:
 * Move the apport blacklist file to thumbnailer-service (only listing
   current architecture now, since it is arch specific).
 * Remove the fallback images entirely, since they are no longer used.

93. By James Henstridge on 2015-07-17

Remove the default image override code from tests.

92. By James Henstridge on 2015-07-17

Remove fallback images.

91. By James Henstridge on 2015-07-16

Fix up tests for removal of fallback art.

90. By James Henstridge on 2015-07-16

Merge from devel