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

Branch merges

Propose for merging

1 branch dependent on this one.

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

PS Jenkins bot: Approve (continuous-integration) on 2016-01-12

Cris Dywan: Approve on 2016-01-12

Diff: 937 lines (+285/-147)

16 files modified

src/Ubuntu/Components/plugin/plugin.cpp (+4/-7)
src/Ubuntu/Components/plugin/ucbottomedge.cpp (+2/-2)
src/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp (+29/-16)
src/Ubuntu/Components/plugin/ucdeprecatedtheme.h (+5/-7)
src/Ubuntu/Components/plugin/uclabel.cpp (+6/-3)
src/Ubuntu/Components/plugin/uclistitem.cpp (+11/-4)
src/Ubuntu/Components/plugin/ucstyleditembase.cpp (+3/-2)
src/Ubuntu/Components/plugin/uctheme.cpp (+75/-62)
src/Ubuntu/Components/plugin/uctheme.h (+6/-12)
src/Ubuntu/Components/plugin/ucthemingextension.cpp (+32/-8)
src/Ubuntu/Components/plugin/ucthemingextension.h (+3/-3)
tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.cpp (+24/-16)
tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.pro (+1/-1)
tests/unit_x11/tst_subtheming/DefaultTheme.qml (+28/-0)
tests/unit_x11/tst_subtheming/tst_subtheming.cpp (+53/-4)
tests/unit_x11/tst_subtheming/tst_subtheming.pro (+3/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1527546: Crash when having multiple QQuickViews in a row

Critical

Fix Released

Link a bug report

Related blueprints

1811. By Zsombor Egri on 2016-01-12

staging merge

1810. By Zsombor Egri on 2016-01-12

UCThemingExtension::getTheme() return NULL i fthe themed item has no assigned QML Engine - it has been created by C++ code and QML Engine has been forgotten to set.

1809. By Zsombor Egri on 2016-01-12

do not instantiate elements, UCTheme reports having uninitialized data ONLY with qmlplugindump

1808. By Zsombor Egri on 2016-01-11

rolling back unwanted changes

1807. By Zsombor Egri on 2016-01-11

do not allow to create default theme multiple times on a given QML engine

1806. By Zsombor Egri on 2016-01-11

more initializations

1805. By Zsombor Egri on 2016-01-11

remove unused parameter

1804. By Zsombor Egri on 2016-01-11

review comment applied; bump year in license header

1803. By Zsombor Egri on 2016-01-11

initialize all theme properties

1802. By Zsombor Egri on 2016-01-11

remove local references to QML engine in UCTheme and use the one from its own context