lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-shape-overlay

Branch merges

Propose for merging

No branches dependent on this one.

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

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

Zsombor Egri: Approve on 2015-03-09

Diff: 1104 lines (+1015/-1)

9 files modified

components.api (+5/-0)
modules/Ubuntu/Components/plugin/plugin.cpp (+2/-0)
modules/Ubuntu/Components/plugin/plugin.pro (+5/-1)
modules/Ubuntu/Components/plugin/plugin.qrc (+2/-0)
modules/Ubuntu/Components/plugin/shaders/shapeoverlay.frag (+65/-0)
modules/Ubuntu/Components/plugin/shaders/shapeoverlay.vert (+49/-0)
modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp (+445/-0)
modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.h (+112/-0)
tests/resources/ubuntushape/UbuntuShapeOverlayTest.qml (+330/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1396170: [UbuntuShape] Add support for rectangle overlay

High

Fix Released

Link a bug report

Related blueprints

1339. By Loïc Molinari on 2015-03-05

Made use of qBound() instead of qMin()/qMax().

1338. By Loïc Molinari on 2015-03-04

Updated components.api.

1337. By Loïc Molinari on 2015-03-04

Merged main branch.

1336. By Loïc Molinari on 2015-03-04

Merged main branch.

1335. By Loïc Molinari on 2015-02-27

Merged main branch.

1334. By Loïc Molinari on 2015-01-29

Switch to 'm_' prefixed private class members.

1333. By Loïc Molinari on 2015-01-29

Reordered material/geometry initialization.

1332. By Loïc Molinari on 2015-01-29

Fixed test import version and date.

1331. By Loïc Molinari on 2015-01-29

Removed GLSL precision qualifier for boolean types.

1330. By Loïc Molinari on 2015-01-29

Updated dates.