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

[Daniel d'Andrada]

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.

[Gerry Boland (gerboland)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

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)

=== modified file 'src/modules/Unity/Application/OSKController.qml'
--- src/modules/Unity/Application/OSKController.qml	2013-10-14 18:39:55 +0000
+++ src/modules/Unity/Application/OSKController.qml	2013-12-12 12:46:09 +0000
@@ -20,8 +20,8 @@
 
 Item {
     id: root
-    property variant __oskSurface: null
-    readonly property bool enabled: __oskSurface !== null
+    property var __oskSurface: null
+    readonly property bool enabled: __oskSurface !== null && __oskSurface !== undefined
 
     UbuntuKeyboardInfo {
         id: ubuntuKeyboardInfo