lp:~mzanetti/ubuntu-ui-toolkit/nonsquareicons-trunk

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:ubuntu-ui-toolkit

Ubuntu SDK team: Pending requested 2015-02-23

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1167. By Michael Zanetti on 2015-02-23

more

1166. By Michael Zanetti on 2015-02-23

tests--

1165. By Michael Zanetti on 2015-02-23

disable some more bad tests

1164. By Michael Zanetti on 2015-02-23

disable bad test

1163. By Michael Zanetti on 2015-02-23

fix bad merge

1162. By Michael Zanetti on 2015-02-23

cherry-pick nonsquareicons branch on top of trunk for a silo build

1161. By Timo Jyrinki on 2015-02-16

No-change rebuild against Qt 5.4.0.

1160. By Launchpad Translations on behalf of ubuntu-sdk-team on 2015-02-10

Launchpad automatic translations update.

1159. By CI Train Bot Account on 2015-02-09

Resync trunk

1158. By CI Train Bot Account on 2015-02-06

Releasing 1.1.1403+15.04.20150206-0ubuntu1