git.iko.soy/unity8
on xenial help sign in
Fix the testMultiGreeter qmluitest. Incoming method variables are apparently read-only in Qt5.3. Fixes: 1332488
65fc570Michael Terry
qml/Greeter/LoginList.qml+4−4
compare with xenial
unifiedsplit
@@ -257,13 +257,13 @@ Item {
257
257
258 onShowMessage: {
258 onShowMessage: {
259 // inefficient, but we only rarely deal with messages
259 // inefficient, but we only rarely deal with messages
260− text = text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g, "<br>");
260+ var html = text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g, "<br>")
261 if (isError)
261 if (isError)
262− text = "<font color=\"#df382c\">" + text + "</font>"
262+ html = "<font color=\"#df382c\">" + html + "</font>"
263 if (infoLabel.text == "")
263 if (infoLabel.text == "")
264− infoLabel.text = text;
264+ infoLabel.text = html
265 else
265 else
266− infoLabel.text = infoLabel.text + "<br>" + text;
266+ infoLabel.text = infoLabel.text + "<br>" + html
267 }
267 }
268
268
269 onShowPrompt: {
269 onShowPrompt: {