unity-mir

Merge lp:~dandrader/unity-mir/lp1248795 into lp:unity-mir

  1. lp1248795
  2. Merge into trunk
Proposed by Daniel d'Andrada
Status: Merged
Approved by: Gerry Boland
Approved revision: 159
Merged at revision: 159
Proposed branch: lp:~dandrader/unity-mir/lp1248795
Merge into: lp:unity-mir
Diff against target: 14 lines (+2/-2)
1 file modified
src/modules/Unity/Application/OSKController.qml (+2/-2)
To merge this branch: bzr merge lp:~dandrader/unity-mir/lp1248795
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Gerry Boland (community) Approve
Review via email: mp+198731@code.launchpad.net

Commit message

Fix OSKController.enabled property

OSKController.enabled was always True as we were missing the check for undefined.

Also s/variant/var as the "variant" QML type is deprecated.

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:159
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/183/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/47/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/46

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/183/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 'src/modules/Unity/Application/OSKController.qml'
2--- src/modules/Unity/Application/OSKController.qml 2013-10-14 18:39:55 +0000
3+++ src/modules/Unity/Application/OSKController.qml 2013-12-12 12:46:09 +0000
4@@ -20,8 +20,8 @@
5
6 Item {
7 id: root
8- property variant __oskSurface: null
9- readonly property bool enabled: __oskSurface !== null
10+ property var __oskSurface: null
11+ readonly property bool enabled: __oskSurface !== null && __oskSurface !== undefined
12
13 UbuntuKeyboardInfo {
14 id: ubuntuKeyboardInfo

Subscribers

People subscribed via source and target branches