lp:~tpeeters/ubuntu-ui-toolkit/actionItem

Branch merges

Propose for merging

No branches dependent on this one.

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

Zsombor Egri: Approve on 2013-06-14

PS Jenkins bot: Approve (continuous-integration) on 2013-06-13

Diff: 426 lines (+173/-38)

12 files modified

components.api (+7/-4)
modules/Ubuntu/Components/AbstractButton.qml (+4/-8)
modules/Ubuntu/Components/ActionItem.qml (+66/-0)
modules/Ubuntu/Components/Button.qml (+3/-3)
modules/Ubuntu/Components/ListItems/Empty.qml (+0/-5)
modules/Ubuntu/Components/ListItems/MultiValue.qml (+1/-1)
modules/Ubuntu/Components/ListItems/SingleValue.qml (+1/-1)
modules/Ubuntu/Components/ListItems/Standard.qml (+1/-1)
modules/Ubuntu/Components/ListItems/ValueSelector.qml (+1/-1)
modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml (+4/-14)
modules/Ubuntu/Components/qmldir (+1/-0)
tests/unit/tst_components/tst_actionitem.qml (+84/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

564. By Tim Peeters on 2013-06-13

update comment

563. By Tim Peeters on 2013-06-13

merge trunk

562. By Tim Peeters on 2013-06-13

re-trigger jenkins test

561. By Tim Peeters on 2013-06-13

fix iconSource test

560. By Tim Peeters on 2013-06-13

merge toolsItem branch

559. By Tim Peeters on 2013-06-12

empty change

558. By Tim Peeters on 2013-06-12

merge toolsItem branch

557. By Tim Peeters on 2013-06-12

update components.api

556. By Tim Peeters on 2013-06-12

fix docs

555. By Tim Peeters on 2013-06-12

add test for ActionItem