Merge lp://staging/~lukas-kde/ubuntu-system-settings/new-menu-components into lp://staging/ubuntu-system-settings

Proposed by Lukáš Tinkl
Status: Merged
Approved by: Jonas G. Drange
Approved revision: 1735
Merged at revision: 1740
Proposed branch: lp://staging/~lukas-kde/ubuntu-system-settings/new-menu-components
Merge into: lp://staging/ubuntu-system-settings
Prerequisite: lp://staging/~ken-vandine/ubuntu-system-settings/pep8_fix
Diff against target: 96 lines (+3/-11)
4 files modified
debian/control (+1/-1)
plugins/language/PageComponent.qml (+2/-3)
plugins/language/PageHardwareKeyboard.qml (+0/-1)
plugins/mouse/Connected.qml (+0/-6)
To merge this branch: bzr merge lp://staging/~lukas-kde/ubuntu-system-settings/new-menu-components
Reviewer Review Type Date Requested Status
Jonas G. Drange (community) Approve
Marco Trevisan (Treviño) (community) Approve
Review via email: mp+310880@code.staging.launchpad.net

This proposal supersedes a proposal from 2016-11-15.

Commit message

Accomodate to new menu components

Description of the change

Accomodate to new menu components

See https://bileto.ubuntu.com/#/ticket/2106

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Good one.

review: Approve
Revision history for this message
Jonas G. Drange (jonas-drange) wrote :

Looks good, couldn't verify the hw keyboard and mouse change, but assume you've tried it.

review: Approve
1736. By Lukáš Tinkl

oops, fixup the Mouse page too

Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

Ok, now the mouse page works too ;)

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Ah, please update also debian bits with depends on qtdeclarative5-ubuntu-settings-components (>= 0.11)

1737. By Lukáš Tinkl

fix depends

Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

Done

1738. By Lukáš Tinkl

merge trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches