lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/strokeColor

Branch merges

Propose for merging

No branches dependent on this one.

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

Tim Peeters: Approve on 2014-07-29

PS Jenkins bot: Approve (continuous-integration) on 2014-07-28

Zsombor Egri: Approve on 2014-06-26

Diff: 534 lines (+223/-103)

14 files modified

components.api (+7/-0)
debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install (+2/-0)
documentation/docs.sh (+2/-2)
examples/ubuntu-ui-toolkit-gallery/Buttons.qml (+10/-0)
modules/Ubuntu/Components/10/10.pro (+9/-0)
modules/Ubuntu/Components/10/Button.qml (+3/-87)
modules/Ubuntu/Components/11/11.pro (+9/-0)
modules/Ubuntu/Components/11/Button.qml (+125/-0)
modules/Ubuntu/Components/Components.pro (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml (+41/-8)
modules/Ubuntu/Components/qmldir (+3/-2)
push_to_phone.sh (+1/-1)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py (+2/-1)
tests/qmlapicheck.py (+8/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1332580: Implement stroke style for Button

High

Fix Released

Link a bug report

Related blueprints

1139. By Cris Dywan on 2014-07-29

Drop docs from 10/Button.qml which are redundant now

1138. By Cris Dywan on 2014-07-29

Merge lp:~tpeeters/ubuntu-ui-toolkit/strokeColorFix

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

1137. By Cris Dywan on 2014-07-28

Add .pro files for 10 and 11 folders

1136. By Cris Dywan on 2014-07-28

Add folders 10 and 11 to qtdeclarative5-ubuntu-ui-toolkit-plugin.install

1135. By Cris Dywan on 2014-07-25

Also push the versioned 10 and 11 folders to the phone

1134. By Cris Dywan on 2014-07-24

Make pep8 happy

1133. By Cris Dywan on 2014-07-23

Use correct Button parent class

1132. By Cris Dywan on 2014-07-23

Move all Button docs into Button.qdoc and mark the real ones as internal

1131. By Cris Dywan on 2014-07-22

Move around Button11.qdoc in an attempt to please qdoc

1130. By Cris Dywan on 2014-07-17

Get un/versioned files in the same order in components.api