Merge lp:~mzanetti/ubuntu-ui-toolkit/nonsquareicons-trunk into lp:ubuntu-ui-toolkit
Proposed by
Michael Zanetti
Status: | Work in progress |
---|---|
Proposed branch: | lp:~mzanetti/ubuntu-ui-toolkit/nonsquareicons-trunk |
Merge into: | lp:ubuntu-ui-toolkit |
Diff against target: |
358 lines (+150/-23) 11 files modified
modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp (+17/-14) modules/Ubuntu/Components/plugin/unitythemeiconprovider.h (+1/-1) tests/unit_x11/tst_components/tst_focus.qml (+1/-1) tests/unit_x11/tst_components/tst_listitem.qml (+3/-3) tests/unit_x11/tst_components/tst_picker.qml (+2/-2) tests/unit_x11/tst_components/tst_pickerpanel.qml (+2/-2) tests/unit_x11/tst_iconprovider/icons/mockTheme/actions/scalable/battery-100-charging.svg (+25/-0) tests/unit_x11/tst_iconprovider/icons/mockTheme/index.theme (+17/-0) tests/unit_x11/tst_iconprovider/tst_iconprovider.cpp (+76/-0) tests/unit_x11/tst_iconprovider/tst_iconprovider.pro (+5/-0) tests/unit_x11/unit_x11.pro (+1/-0) |
To merge this branch: | bzr merge lp:~mzanetti/ubuntu-ui-toolkit/nonsquareicons-trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu SDK team | Pending | ||
Review via email: mp+250604@code.launchpad.net |
Commit message
Not intended for merging. MP required for silo build.
Description of the change
cherry-picking nonsquareicons fix on top of trunk.
To post a comment you must log in.
Unmerged revisions
- 1167. By Michael Zanetti
-
more
- 1166. By Michael Zanetti
-
tests--
- 1165. By Michael Zanetti
-
disable some more bad tests
- 1164. By Michael Zanetti
-
disable bad test
- 1163. By Michael Zanetti
-
fix bad merge
- 1162. By Michael Zanetti
-
cherry-pick nonsquareicons branch on top of trunk for a silo build