lp:~bzoltan/ubuntu-ui-toolkit/landing_28-05

Branch merges

Propose for merging

No branches dependent on this one.

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

PS Jenkins bot: Needs Fixing (continuous-integration) on 2014-06-02

Zsombor Egri: Pending requested 2014-05-28

Diff: 594 lines (+241/-82)

16 files modified

components.api (+7/-1)
modules/Ubuntu/Components/AnimatedItem.qml (+1/-38)
modules/Ubuntu/Components/ListItems/Base.qml (+1/-1)
modules/Ubuntu/Components/PageStack.qml (+1/-0)
modules/Ubuntu/Components/Pickers/DatePicker.qml (+4/-2)
modules/Ubuntu/Components/plugin/i18n.cpp (+6/-5)
modules/Ubuntu/Components/plugin/thumbnailgenerator.cpp (+6/-3)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py (+16/-0)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py (+0/-17)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py (+2/-9)
tests/autopilot/ubuntuuitoolkit/fixture_setup.py (+45/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/CustomMainView.qml (+23/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.HeaderInCustomMainViewTestCase.qml (+24/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py (+27/-0)
tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py (+72/-1)
tests/qmlapicheck.py (+6/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1094. By Zoltan Balogh on 2014-06-02

Fix changelog

1093. By Zoltan Balogh on 2014-06-02

Fix changelog

1092. By Zoltan Balogh on 2014-06-02

Fix changelog

1091. By Zoltan Balogh on 2014-06-02

Fix changelog

1090. By Zoltan Balogh on 2014-05-30

On the autopilot Header helper, do not assume that the top container will be a MainView

1089. By Zoltan Balogh on 2014-05-28

Undo changes of r1082 that cause a regression in messaging-app (and contenthub).

Merged branch lp:~tpeeters/ubuntu-ui-toolkit/noPrivateHeader

1088. By Zoltan Balogh on 2014-05-28

Merged from the trunk

1087. By Zoltan Balogh on 2014-05-28

Landing 28/05

1086. By Cris Dywan on 2014-05-28

Tweak API parsing to include the Button.font property. Fixes: https://bugs.launchpad.net/bugs/1322169.

Approved by PS Jenkins bot.

1085. By Zsombor Egri on 2014-05-28

Missing "default" keyword added to children property of Base, causing rendering and test case failures on Qt 5.3. Fixes: https://bugs.launchpad.net/bugs/1317881.

Approved by PS Jenkins bot, Tim Peeters.