lp://staging/~tpeeters/ubuntu-ui-toolkit/no-red-header

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://staging/ubuntu-ui-toolkit

PS Jenkins bot: Pending (continuous-integration) requested 2016-06-17

Ubuntu SDK team: Pending requested 2016-06-17

Diff: 855 lines (+319/-81)

34 files modified

components.api (+6/-0)
debian/changelog (+28/-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.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/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/ucabstractbutton.cpp (+0/-3)
src/Ubuntu/Components/plugin/ucperformancemonitor.cpp (+24/-6)
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

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2011. By Tim Peeters on 2016-06-17

disable red outline on deprecated header in APL

2010. By Zoltan Balogh on 2016-06-15

OTA12-2016-06-15 landing

2009. By Zoltan Balogh on 2016-06-15

sync wit trunk

2008. By Tim Peeters on 2016-06-14

Introduce Styles.SectionsStyle. Fixes: https://bugs.launchpad.net/bugs/1585548.

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

2007. By Cris Dywan on 2016-06-14

Select the current item before adding the test page.

Approved by ubuntu-sdk-build-bot, Tim Peeters.

2006. By Tim Peeters on 2016-06-14

Update header contents only after its style was initialized. Fixes: https://bugs.launchpad.net/bugs/1588837.

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

2005. By Florian Boucault on 2016-06-14

Do not initialize haptics at startup but only when used for the first time.

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

2004. By Florian Boucault on 2016-06-14

PageHeadButton: do not load the icon until the button is made visible.

Approved by ubuntu-sdk-build-bot, Tim Peeters.

2003. By Cris Dywan on 2016-06-14

Correctly use build/src dir with unit tests. Fixes: https://bugs.launchpad.net/bugs/1589982.

Approved by ubuntu-sdk-build-bot, Benjamin Zeller.

2002. By Tim Peeters on 2016-06-13

Update export_qml_dir.qml to work inside a lxd container.

Approved by ubuntu-sdk-build-bot, Benjamin Zeller.