lp:~aacid/ubuntu-ui-toolkit/dpr_rebase_qt_5.1_with_ifdefs

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu-ui-toolkit

PS Jenkins bot: Approve (continuous-integration) on 2013-11-22

Ubuntu SDK team: Pending requested 2013-11-22

Diff: 449 lines (+172/-7)

9 files modified

modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml (+1/-0)
modules/Ubuntu/Components/plugin/shapeitem.cpp (+17/-0)
modules/Ubuntu/Components/plugin/ucqquickimageextension.cpp (+47/-3)
modules/Ubuntu/Components/plugin/ucscalingimageprovider.cpp (+20/-0)
modules/Ubuntu/Components/plugin/ucunits.cpp (+17/-1)
modules/Ubuntu/Components/plugin/ucunits.h (+2/-0)
tests/unit/tst_qquick_image_extension/tst_qquick_image_extension.cpp (+4/-0)
tests/unit/tst_scaling_image_provider/tst_scaling_image_provider.cpp (+10/-3)
tests/unit/tst_units/tst_units.cpp (+54/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

749. By Albert Astals Cid on 2013-11-22

Forgot this ifdef

748. By Albert Astals Cid on 2013-11-22

Add ifdefs for simultaneous 5.0 and 5.1/2 compilation

747. By Albert Astals Cid on 2013-11-22

Merge

746. By Florian Boucault on 2013-11-20

Merged trunk

745. By Florian Boucault on 2013-11-19

Merged trunk

744. By Florian Boucault on 2013-11-05

Merged from trunk

743. By Florian Boucault on 2013-09-03

Rebase resolution independence on Qt's infrastructure:
- QPlatformScreen::devicePixelRatio
- QPlatformWindow::devicePixelRatio

742. By PS Jenkins bot on 2013-09-03

Releasing 0.1.46+13.10.20130903.4-0ubuntu1 (revision 741 from lp:ubuntu-ui-toolkit).

Approved by PS Jenkins bot.

741. By Nicolas d'Offay on 2013-09-03

Hide header label if no label is input.

Fix for: OptionSelector.qml:205: ReferenceError: UbuntuAnimation is not defined

Fixed containerHeight affecting the entire Selector's height even if the contentHeight was less. Fixes: https://bugs.launchpad.net/bugs/1220130.

Approved by Zsombor Egri, PS Jenkins bot.

740. By PS Jenkins bot on 2013-09-03

Releasing 0.1.46+13.10.20130903.3-0ubuntu1 (revision 738 from lp:ubuntu-ui-toolkit).

Approved by PS Jenkins bot.