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

Branch merges

Propose for merging

No branches dependent on this one.

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

ubuntu-sdk-build-bot: Approve (continuous-integration) on 2016-03-15

Tim Peeters: Approve on 2016-03-14

Diff: 197 lines (+105/-29)

6 files modified

src/Ubuntu/Components/plugin/uctheme.cpp (+30/-25)
tests/unit_x11/tst_subtheming/themes/DerivedTheme/1.2/TestStyle.qml (+21/-0)
tests/unit_x11/tst_subtheming/themes/DerivedTheme/1.3/Palette.qml (+29/-0)
tests/unit_x11/tst_subtheming/themes/DerivedTheme/parent_theme (+1/-0)
tests/unit_x11/tst_subtheming/tst_subtheming.cpp (+19/-0)
tests/unit_x11/tst_subtheming/tst_subtheming.pro (+5/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1555797: Theme loads MainViewStyle 1.2 when MainView has a dark backgroundColor set.

High

Fix Released

Link a bug report

Related blueprints

1895. By Zsombor Egri on 2016-03-14

rename test

1894. By Zsombor Egri on 2016-03-14

remove rogue debug line

1893. By Zsombor Egri on 2016-03-14

update test to use custom theme

1892. By Zsombor Egri on 2016-03-14

fix

1891. By Zsombor Egri on 2016-03-14

adding tests

1890. By Zsombor Egri on 2016-03-14

'bug'

1889. By Zsombor Egri on 2016-03-14

Fix AsyncLoader tests so they create slightly less amount of elements.

Approved by ubuntu-sdk-build-bot, Zoltan Balogh.

1888. By Zoltan Balogh on 2016-03-10

Sync with trunk

1887. By Benjamin Zeller on 2016-03-09

Register expected warning messages in the tree testcase.

Approved by ubuntu-sdk-build-bot, Tim Peeters.

1886. By Michael Terry on 2016-03-08

Add grabGesture field to SwipeArea.
This field controls whether the SwipeArea takes ownership of the gestures it observes. Fixes: https://bugs.launchpad.net/bugs/1527387.

Approved by ubuntu-sdk-build-bot, Zsombor Egri, Timo Jyrinki, PS Jenkins bot.