Merge lp:~mterry/unity8/fix-multigreeter-qt5.3 into lp:unity8

[Michael Terry]

Fix the testMultiGreeter qmluitest. Incoming method variables are apparently read-only in Qt5.3.

Fix the testMultiGreeter qmluitest. Incoming method variables are apparently read-only in Qt5.3.

Is that assessment correct? If I set to 'text' variable, it doesn't stick. But writing to a new var works like I'd expect.

== Checklist ==

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 - No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
 - Yup, ran the test

 * Did you make sure that your branch does not contain spurious tags?
 - Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
 - NA

 * If you changed the UI, has there been a design review?
 - NA

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:978
http://jenkins.qa.ubuntu.com/job/unity8-ci/3190/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1082
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/194
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/284
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/284
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/284/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/284
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1452
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1892
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1892/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8695

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3190/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yup. Test passes.

 * Did CI run pass? If not, please explain why.
No, other 5.3 failures :|

review: Approve

=== modified file 'qml/Greeter/LoginList.qml'
--- qml/Greeter/LoginList.qml	2014-05-28 14:48:52 +0000
+++ qml/Greeter/LoginList.qml	2014-06-20 23:07:12 +0000
@@ -257,13 +257,13 @@
 
         onShowMessage: {
             // inefficient, but we only rarely deal with messages
-            text = text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g, "<br>");
+            var html = text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g, "<br>")
             if (isError)
-                text = "<font color=\"#df382c\">" + text + "</font>"
+                html = "<font color=\"#df382c\">" + html + "</font>"
             if (infoLabel.text == "")
-                infoLabel.text = text;
+                infoLabel.text = html
             else
-                infoLabel.text = infoLabel.text + "<br>" + text;
+                infoLabel.text = infoLabel.text + "<br>" + html
         }
 
         onShowPrompt: {