Merge lp:~ken-vandine/ubuntu-system-settings/lp1669780 into lp:ubuntu-system-settings

Proposed by Ken VanDine on 2017-03-22
Status: Merged
Approved by: Jonas G. Drange on 2017-03-22
Approved revision: 1765
Merged at revision: 1773
Proposed branch: lp:~ken-vandine/ubuntu-system-settings/lp1669780
Merge into: lp:ubuntu-system-settings
Diff against target: 21 lines (+1/-6)
1 file modified
plugins/bluetooth/PageComponent.qml (+1/-6)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-system-settings/lp1669780
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Approve on 2017-03-22
Jonas G. Drange (community) 2017-03-22 Approve on 2017-03-22
Review via email: mp+320619@code.launchpad.net

Commit message

[bluetooth] Fix property and anchor errors

Description of the change

[bluetooth] Fix property and anchor errors

To post a comment you must log in.
Jonas G. Drange (jonas-drange) wrote :

Makes sense. Thanks!

review: Approve

PASSED: Continuous integration, rev:1765
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/17/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2337
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2336
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2158
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2158/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2158
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2158/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2158
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2158/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2158
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2158/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2158
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2158/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2158
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2158/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/17/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/bluetooth/PageComponent.qml'
2--- plugins/bluetooth/PageComponent.qml 2016-12-06 15:38:02 +0000
3+++ plugins/bluetooth/PageComponent.qml 2017-03-22 12:10:46 +0000
4@@ -250,16 +250,11 @@
5 // Discoverability
6 SettingsListItems.SingleValue {
7 text: backend.discoverable ? i18n.tr("Discoverable") : i18n.tr("Not discoverable")
8- value: backend.discoverable ? backend.adapterName() : ""
9+ value: backend.discoverable ? backend.adapterName : ""
10 enabled: bluetoothActionGroup.enabled
11 showDivider: false
12
13 Label {
14- anchors {
15- verticalCenter: parent.verticalCenter
16- right: parent.right
17- rightMargin: units.gu(2)
18- }
19 color: "darkgrey"
20 visible: backend.powered && !backend.discoverable
21 text: i18n.tr("Searching…")

Subscribers

People subscribed via source and target branches