lp:~zsombi/ubuntu-ui-toolkit/fixThemingFallback

Branch merges

Propose for merging

No branches dependent on this one.

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

Zoltan Balogh: Approve on 2015-10-06

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

Diff: 110 lines (+8/-36)

3 files modified

src/Ubuntu/Components/plugin/ucstyleditembase.cpp (+5/-8)
src/Ubuntu/Components/plugin/ucstyleditembase_p.h (+1/-0)
tests/unit_x11/tst_subtheming/tst_subtheming.cpp (+2/-28)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1675. By Zsombor Egri on 2015-10-06

no longer fall back to 1.2 themes when 1.2 and 1.3 are mixed

1674. By Cris Dywan on 2015-10-05

Merge open_page and _open_page in GalleryTestCase.

Approved by PS Jenkins bot, Tim Peeters.

1673. By Zsombor Egri on 2015-10-04

Make primaryPage and primaryPageSource replaceable after component completion. Fixes: https://bugs.launchpad.net/bugs/1500934.

Approved by Christian Dywan, PS Jenkins bot.

1672. By Zoltan Balogh on 2015-10-02

[UbuntuShape] Workaround Adreno 320's shader compiler bug.

1671. By Zoltan Balogh on 2015-10-02

sync with trunk

1670. By Tim Peeters on 2015-10-02

Use the new cpp Header in the internal AppHeader.

Approved by PS Jenkins bot, Zsombor Egri.

1669. By Zsombor Egri on 2015-10-01

AbstractButton.pressAndHold captured in Connection. Fixes: https://bugs.launchpad.net/bugs/1495554.

Approved by Christian Dywan, PS Jenkins bot.

1668. By Tim Peeters on 2015-10-01

Don't use old Label type in AP tests for header.

Approved by PS Jenkins bot, Christian Dywan.

1667. By Andrea Bernabei on 2015-10-01

Remove REVISION 1 from textSize property of UCLabel and add test in ListItemLayout tests to avoid breaking textSize initialization again. Fixes: https://bugs.launchpad.net/bugs/1501673.

Approved by PS Jenkins bot, Zsombor Egri.

1666. By Cris Dywan on 2015-10-01

Remove ' from ActionList - no separator here.

Approved by PS Jenkins bot, Tim Peeters.