lp://staging/~zsombi/ubuntu-ui-toolkit/01-multiple-theme-engines

Branch merges

Propose for merging

No branches dependent on this one.

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

PS Jenkins bot: Needs Fixing (continuous-integration) on 2015-04-02

Tim Peeters: Approve on 2015-04-02

Diff: 1386 lines (+616/-234)

23 files modified

modules/Ubuntu/Components/plugin/plugin.cpp (+3/-3)
modules/Ubuntu/Components/plugin/plugin.pro (+6/-4)
modules/Ubuntu/Components/plugin/ucdefaulttheme.cpp (+7/-7)
modules/Ubuntu/Components/plugin/ucdefaulttheme.h (+6/-6)
modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp (+124/-0)
modules/Ubuntu/Components/plugin/ucdeprecatedtheme.h (+53/-0)
modules/Ubuntu/Components/plugin/uclistitem.cpp (+7/-4)
modules/Ubuntu/Components/plugin/uctheme.cpp (+57/-46)
modules/Ubuntu/Components/plugin/uctheme.h (+17/-10)
tests/resources/subtheming/Simple.qml (+45/-0)
tests/unit/tst_performance/StyledItemOldTheming.qml (+72/-0)
tests/unit/tst_performance/tst_performance.cpp (+4/-0)
tests/unit/tst_performance/tst_performance.pro (+2/-1)
tests/unit_x11/tst_components/tst_app_theming.qml (+54/-0)
tests/unit_x11/tst_components/tst_components.pro (+2/-2)
tests/unit_x11/tst_deprecated_theme_engine/Parent.qml (+14/-4)
tests/unit_x11/tst_deprecated_theme_engine/SimpleItem.qml (+20/-0)
tests/unit_x11/tst_deprecated_theme_engine/themes/CustomTheme/TestStyle.qml (+0/-1)
tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/TestStyle.qml (+0/-1)
tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.cpp (+113/-113)
tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.pro (+9/-2)
tests/unit_x11/tst_theme_engine/TestApp.qml (+0/-29)
tests/unit_x11/unit_x11.pro (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1248982: [theming] rewrite theming unit tests

High

Fix Released

Link a bug report

Related blueprints

1448. By Zsombor Egri on 2015-04-02

CI kick

1447. By Zsombor Egri on 2015-04-01

staging merge

1446. By Zsombor Egri on 2015-03-23

funny branch divergence fix

1445. By Zsombor Egri on 2015-03-23

staging sync

1444. By Zsombor Egri on 2015-03-23

review comments applied

1443. By Zsombor Egri on 2015-03-13

Rename ThemeSettings to DefaultTheme

1442. By Zsombor Egri on 2015-03-13

staging sync

1441. By Zsombor Egri on 2015-03-11

staging sync

1440. By Zsombor Egri on 2015-03-10

small doc fixes, removed deprecation comments, will be added when appropriate

1439. By Zsombor Egri on 2015-03-10

App theming test moved into its own test