lp://qastaging/~unity-team/ubuntu-ui-toolkit/fix-1242647

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://qastaging/ubuntu-ui-toolkit

PS Jenkins bot: Needs Fixing (continuous-integration) on 2014-01-30

Tim Peeters: Pending requested 2014-01-30

Diff: 451 lines (+126/-72)

8 files modified

CHANGES (+2/-0)
components.api (+2/-0)
examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml (+7/-11)
modules/Ubuntu/Components/ListItems/ItemSelector.qml (+25/-5)
modules/Ubuntu/Components/OptionSelector.qml (+34/-17)
modules/Ubuntu/Components/OptionSelectorDelegate.qml (+20/-2)
tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py (+6/-5)
tests/unit_x11/tst_components/tst_optionselector.qml (+30/-32)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

899. By Nicolas d'Offay on 2014-01-14

Added additional skip to test.

898. By Nicolas d'Offay on 2014-01-14

Removed test and standalone selector delegate.

897. By Nicolas d'Offay on 2014-01-14

Readded skip for test which fails in CI. Removed prints.

896. By Nicolas d'Offay on 2014-01-14

Removed unused selectorDelegate.

895. By Nicolas d'Offay on 2014-01-14

Added semicolon.

894. By Nicolas d'Offay on 2014-01-14

Instantiated SelectorDelegate in class creation instead of externally as a component.

893. By Nicolas d'Offay on 2014-01-14

Removed skips in test.

892. By Nicolas d'Offay on 2014-01-14

Merged trunk.

891. By Nicolas d'Offay on 2014-01-14

Changed comment.

890. By Nicolas d'Offay on 2014-01-13

Fixed comment.