lp:~mardy/ubuntu-ui-toolkit/lp1221707

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-ui-toolkit at revision 759

PS Jenkins bot: Approve (continuous-integration) on 2013-09-24

Zsombor Egri: Approve on 2013-09-12

Diff: 275 lines (+140/-17)

9 files modified

modules/Ubuntu/Components/plugin/listener.cpp (+1/-0)
modules/Ubuntu/Components/plugin/plugin.cpp (+14/-10)
modules/Ubuntu/Components/plugin/quickutils.h (+2/-1)
modules/Ubuntu/Components/plugin/shapeitem.cpp (+9/-3)
modules/Ubuntu/Components/plugin/uctheme.cpp (+3/-2)
tests/unit_x11/tst_recreateview/SimpleApp.qml (+35/-0)
tests/unit_x11/tst_recreateview/tst_recreateview.cpp (+70/-0)
tests/unit_x11/tst_recreateview/tst_recreateview.pro (+5/-0)
tests/unit_x11/unit_x11.pro (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1221707: Application crashes after the QQuickView has been destroyed and recreated

Undecided

Fix Released

Link a bug report

Related blueprints

747. By Alberto Mardegan on 2013-09-24

Merge changes from trunk

746. By Alberto Mardegan on 2013-09-11

Improve tests

745. By Alberto Mardegan on 2013-09-11

Tests: add test for bug 1221707

744. By Alberto Mardegan on 2013-09-09

Support re-attaching to a different QQuickView

Make the plugin correctly handle the case when the QQuickView is destroyed and
a new one is created: this is done by avoiding using static variables, and
instead binding the data to the QQmlEngine, QQmlContext or QWindow as
appropriate.

743. By Leo Arias on 2013-09-05

Do not duplicate the pointer instantiation on the autopilot emulators. Fixes: https://bugs.launchpad.net/bugs/1220346.

Approved by Thomi Richards, PS Jenkins bot.

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.

739. By Günter Schwann on 2013-09-03

Fixes tab switching with open toolbar fixes https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1220064. Fixes: https://bugs.launchpad.net/bugs/1220064.

Approved by PS Jenkins bot.

738. By Zoltan Balogh on 2013-09-03

Reverse cherrypicking rev734.

Approved by PS Jenkins bot, Łukasz Zemczak.