lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-shape-texture-ref-counting

Branch merges

Propose for merging

No branches dependent on this one.

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

PS Jenkins bot: Needs Fixing (continuous-integration) on 2016-04-20

Ubuntu SDK team: Pending requested 2016-04-20

Diff: 1250 lines (+404/-190)

41 files modified

components.api (+6/-0)
export_qml_dir.sh (+2/-0)
src/Ubuntu/Components/1.3/AdaptivePageLayout.qml (+3/-0)
src/Ubuntu/Components/1.3/PageHeader.qml (+2/-1)
src/Ubuntu/Components/1.3/TextArea.qml (+3/-4)
src/Ubuntu/Components/Styles/1.3/PageHeadStyle.qml (+1/-0)
src/Ubuntu/Components/Styles/1.3/SectionsStyle.qml (+50/-0)
src/Ubuntu/Components/Styles/Styles.pro (+1/-3)
src/Ubuntu/Components/Styles/qmldir (+1/-0)
src/Ubuntu/Components/Themes/Ambiance/1.2/PageHeadButton.qml (+1/-1)
src/Ubuntu/Components/Themes/Ambiance/1.2/ProgressionVisualStyle.qml (+2/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadButton.qml (+1/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml (+10/-0)
src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml (+1/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml (+1/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/ScrollbarStyle.qml (+2/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml (+16/-30)
src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml (+6/-0)
src/Ubuntu/Components/Themes/ThemesModule.pro (+0/-3)
src/Ubuntu/Components/plugin/plugin.pri (+2/-1)
src/Ubuntu/Components/plugin/ucabstractbutton.cpp (+0/-3)
src/Ubuntu/Components/plugin/ucperformancemonitor.cpp (+24/-6)
src/Ubuntu/Components/plugin/ucubuntushape.cpp (+77/-90)
src/Ubuntu/Components/plugin/ucubuntushape.h (+7/-2)
src/Ubuntu/Components/plugin/ucubuntushapetextures.cpp (+5/-11)
src/Ubuntu/Components/plugin/ucubuntushapetextures.h (+17/-0)
tests/unit/add_qmlmakecheck.pri (+1/-1)
tests/unit/add_qmlmakecheck_x11.pri (+1/-1)
tests/unit/i18n/LocalizedApp/LocalizedApp.pro (+0/-1)
tests/unit/i18n/RelativeTime/RelativeTime.pro (+0/-1)
tests/unit/mainview/mainview.pro (+0/-2)
tests/unit/page/page.pro (+0/-2)
tests/unit/performance/TextArea13Grid.qml (+33/-0)
tests/unit/performance/tst_performance.cpp (+1/-0)
tests/unit/runtest.sh (+20/-15)
tests/unit/visual/gallery.qml (+78/-0)
tests/unit/visual/gallery.sh (+6/-0)
tests/unit/visual/tst_pageheader.qml (+2/-1)
tests/unit/visual/tst_picker13.qml (+1/-0)
tests/unit/visual/tst_popups_dialog13.qml (+13/-0)
tests/xvfb.sh (+7/-4)

api

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

ubuntu-sdk-build-bot: Approve (continuous-integration) on 2016-06-16

Tim Peeters: Approve on 2016-06-16

Gerry Boland (community): Needs Information on 2016-02-24

Diff: 373 lines (+108/-104)

5 files modified

src/Ubuntu/Components/plugin/plugin.pri (+2/-1)
src/Ubuntu/Components/plugin/ucubuntushape.cpp (+77/-90)
src/Ubuntu/Components/plugin/ucubuntushape.h (+7/-2)
src/Ubuntu/Components/plugin/ucubuntushapetextures.cpp (+5/-11)
src/Ubuntu/Components/plugin/ucubuntushapetextures.h (+17/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1846. By Loïc Molinari on 2016-06-16

Merged lp:ubuntu-ui-toolkit/staging.

1845. By Loïc Molinari on 2016-02-10

Used auto for iterator (one of the few places for which there's a consensus, at least for me).

1844. By Loïc Molinari on 2016-02-10

Fixed build.

1843. By Loïc Molinari on 2016-02-10

[UbuntuShape] Switched to a ref counting mechanism for texture sharing amongst contexts.

1842. By Robert Ancell on 2016-02-09

Fix documentation typo - Ubunut -> Ubuntu.

Approved by ubuntu-sdk-build-bot, Timo Jyrinki, PS Jenkins bot.

1841. By Colin Watson on 2016-02-09

Make src/Ubuntu/Test depend on src/Ubuntu/Components, to fix build with high parallelisation.

Approved by ubuntu-sdk-build-bot, Zoltan Balogh.

1840. By Benjamin Zeller on 2016-02-09

Move PageWrapper.qml to C++ for 1.3.

Approved by ubuntu-sdk-build-bot, Zsombor Egri.

1839. By Cris Dywan on 2016-02-09

Skip flaky tst_mousefilterTest::doubleClicked. Fixes: https://bugs.launchpad.net/bugs/1542215.

Approved by ubuntu-sdk-build-bot, Timo Jyrinki.

1838. By Cris Dywan on 2016-02-08

Suppress click signal if releasing outside of ListItem. Fixes: https://bugs.launchpad.net/bugs/1541148.

Approved by ubuntu-sdk-build-bot, Zsombor Egri.

1837. By Tim Peeters on 2016-02-08

Add 'animate' property to new internal AppHeaderBase, and do not show a header animation when starting an app without header. Fixes: https://bugs.launchpad.net/bugs/1518002, https://bugs.launchpad.net/bugs/1524901.

Approved by ubuntu-sdk-build-bot, Christian Dywan.