on xenial help sign in
Fix the testMultiGreeter qmluitest. Incoming method variables are apparently read-only in Qt5.3. Fixes: 1332488
commit65fc57053914a8d99c9ceffc463c015de92822f8 authorMichael Terry <michael.terry@canonical.com> dateFri 27 Jun 2014, 08:47 (12 years ago) parent0eb1d756747b53
1 file changed+4−4
qml/Greeter/LoginList.qml+4−4
qml/Greeter/LoginList.qml+4−4
@@ -257,13 +257,13 @@ Item {
257257
258258 onShowMessage: {
259259 // 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>")
261261 if (isError)
262− text = "<font color=\"#df382c\">" + text + "</font>"
262+ html = "<font color=\"#df382c\">" + html + "</font>"
263263 if (infoLabel.text == "")
264− infoLabel.text = text;
264+ infoLabel.text = html
265265 else
266− infoLabel.text = infoLabel.text + "<br>" + text;
266+ infoLabel.text = infoLabel.text + "<br>" + html
267267 }
268268
269269 onShowPrompt: {