lp:~zsombi/ubuntu-ui-toolkit/100-captions

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-ui-toolkit/staging at revision 1428

PS Jenkins bot: Approve (continuous-integration) on 2015-03-03

Tim Peeters: Approve on 2015-03-03

Cris Dywan: Approve on 2015-03-02

Diff: 683 lines (+443/-35)

15 files modified

components.api (+9/-0)
debian/control (+2/-0)
documentation/overview.qdoc (+4/-0)
modules/Ubuntu/Components/Captions.qml (+150/-0)
modules/Ubuntu/Components/plugin/plugin.cpp (+10/-0)
modules/Ubuntu/Components/plugin/plugin.pro (+4/-2)
modules/Ubuntu/Components/plugin/ucnamespace.cpp (+48/-0)
modules/Ubuntu/Components/plugin/ucnamespace.h (+36/-0)
modules/Ubuntu/Components/qmldir (+1/-0)
tests/resources/listitems/ListItemDragging.qml (+17/-13)
tests/resources/listitems/ListItemTest.qml (+38/-18)
tests/unit/tst_performance/ListItemList.qml (+2/-2)
tests/unit/tst_performance/ListOfCaptions.qml (+35/-0)
tests/unit/tst_performance/tst_performance.cpp (+1/-0)
tests/unit_x11/tst_components/tst_captions.qml (+86/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1437. By Zsombor Egri on 2015-03-03

staging sync

1436. By Zsombor Egri on 2015-03-03

enum changes updated on unit tests

1435. By Zsombor Egri on 2015-03-02

review comments addressed

1434. By Zsombor Egri on 2015-03-02

preset property type changed to enum and renamed to captionStyle

1433. By Zsombor Egri on 2015-03-02

build dependency to QtQuick.Layouts added

1432. By Zsombor Egri on 2015-03-02

more of ListItemLayout removed

1431. By Zsombor Egri on 2015-03-02

staging merge

1430. By Zsombor Egri on 2015-03-02

removing ListItemLayout reference

1429. By Zsombor Egri on 2015-02-27

reverting commented code

1428. By Zsombor Egri on 2015-02-27

API fixed