lp:~laney/ubuntu-ui-toolkit/crossfadeimage

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-ui-toolkit at revision 596

PS Jenkins bot: Approve (continuous-integration) on 2013-07-09

Florian Boucault (community): Needs Fixing on 2013-07-08

Diff: 332 lines (+301/-0)

4 files modified

components.api (+8/-0)
modules/Ubuntu/Components/CrossFadeImage.qml (+196/-0)
modules/Ubuntu/Components/qmldir (+1/-0)
tests/unit/tst_components/tst_CrossFadeImage.qml (+96/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

588. By Iain Lane on 2013-07-09

components.api: status has type int

587. By Iain Lane on 2013-07-09

Merge status/test fixes from lp:~fboucault/ubuntu-ui-toolkit/crossfadeimage

586. By Iain Lane on 2013-07-08

Remove the FIXME which is fixed

585. By Iain Lane on 2013-07-08

Merge Florian's branch again

584. By Iain Lane on 2013-07-08

Update duration in tests too

583. By Iain Lane on 2013-07-08

Merge lp:~fboucault/ubuntu-ui-toolkit/crossfadeimage

582. By Iain Lane on 2013-07-08

Merge trunk

581. By Iain Lane on 2013-07-08

CrossFadeImage: Rename 'duration' back to 'fadeDuration' and 'root' to 'crossFadeImage'

580. By Iain Lane on 2013-07-05

Bind duration from the animation to the property instead of using an alias.

The alias makes the build fail for some inexplicable reason (no test failures).

Also remove a qdoc link which couldn't be resolved.

579. By Iain Lane on 2013-07-05

Merge trunk