lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/dpr

Branch merges

Propose for merging

No branches dependent on this one.

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

Zsombor Egri: Approve on 2015-08-13

PS Jenkins bot: Approve (continuous-integration) on 2015-08-12

Loïc Molinari (community): Approve on 2015-08-11

Gerry Boland (community): Needs Information on 2015-04-27

Diff: 1044 lines (+747/-26)

22 files modified

debian/control (+5/-0)
src/Ubuntu/Components/plugin/ucqquickimageextension.cpp (+23/-3)
src/Ubuntu/Components/plugin/ucubuntushape.cpp (+17/-13)
src/Ubuntu/Components/plugin/ucunits.cpp (+46/-5)
src/Ubuntu/Components/plugin/ucunits.h (+1/-0)
tests/unit/add_makecheck.pri (+12/-1)
tests/unit/custom_qpa/README (+15/-0)
tests/unit/custom_qpa/custom.json (+3/-0)
tests/unit/custom_qpa/custom_qpa.pro (+15/-0)
tests/unit/custom_qpa/main.cpp (+54/-0)
tests/unit/custom_qpa/qcustombackingstore.cpp (+64/-0)
tests/unit/custom_qpa/qcustombackingstore.h (+55/-0)
tests/unit/custom_qpa/qcustomintegration.cpp (+112/-0)
tests/unit/custom_qpa/qcustomintegration.h (+74/-0)
tests/unit/runtest.sh (+2/-0)
tests/unit/tst_units/dpr1/dpr1.pro (+3/-0)
tests/unit/tst_units/dpr2/dpr2.pro (+3/-0)
tests/unit/tst_units/dpr2/tst_units_dpr2.cpp (+143/-0)
tests/unit/tst_units/dpr3/dpr3.pro (+3/-0)
tests/unit/tst_units/dpr3/tst_units_dpr3.cpp (+88/-0)
tests/unit/tst_units/tst_units.pro (+6/-3)
tests/unit/unit.pro (+3/-1)

api

Superseded for merging into lp:ubuntu-ui-toolkit

Ubuntu SDK team: Pending requested 2015-04-16

Diff: 245 lines (+61/-29)

5 files modified

modules/Ubuntu/Components/plugin/ucqquickimageextension.cpp (+10/-3)
modules/Ubuntu/Components/plugin/ucubuntushape.cpp (+8/-10)
modules/Ubuntu/Components/plugin/ucunits.cpp (+37/-12)
modules/Ubuntu/Components/plugin/ucunits.h (+5/-3)
ubuntu-sdk.pro (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1207270: Font size too small in browser with Qt 5.1 / DPR rework	High	Fix Released
Bug #1275748: Ubuntu QPA plugin does not override QScreen::devicePixelRatio	Medium	In Progress
Bug #1468402: UITK breaks Widget fonts in mixed applications	Undecided	Fix Released

Link a bug report

Related blueprints

1205. By Gerry Boland on 2015-08-12

Revert accidental changes to examples/ubuntu-ui-toolkit-gallery/po/nl.po

1204. By Gerry Boland on 2015-08-12

Merge staging again

1203. By Gerry Boland on 2015-08-12

Merge staging again

1202. By Gerry Boland on 2015-08-12

Fix build fail - variable inited twice

1201. By Gerry Boland on 2015-08-11

Merge staging

1200. By Gerry Boland on 2015-08-11

Undo changes to paths for gallery launcher

1199. By Gerry Boland on 2015-08-04

Merge staging, fix a conflict

1198. By Gerry Boland on 2015-07-27

Revert rev 1196

1197. By Gerry Boland on 2015-07-27

Merge staging and fix conflicts

1196. By Gerry Boland on 2015-07-14

Bump version