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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/strokeColor at revision 1138

Ubuntu SDK team: Pending requested 2014-07-29

Diff: 230 lines (+106/-90)

3 files modified

modules/Ubuntu/Components/10/Button.qml (+1/-16)
modules/Ubuntu/Components/11/Button.qml (+105/-6)
modules/Ubuntu/Components/Button.qdoc (+0/-68)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1139. By Tim Peeters on 2014-07-28

typo

1138. By Tim Peeters on 2014-07-28

Copy the 1.0 API in Button.qml 1.1 instead of inheritance. Remove Button.qdoc

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