From be01689f43cf6882cf670d33df49ead1f570c53a Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Sun, 27 May 2012 21:51:42 +0200 Subject: Imported WebKit commit 8d6c5efc74f0222dfc7bcce8d845d4a2707ed9e6 (http://svn.webkit.org/repository/webkit/trunk@118629) --- Source/WebKit/qt/Api/qwebpage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/WebKit/qt/Api/qwebpage.cpp') diff --git a/Source/WebKit/qt/Api/qwebpage.cpp b/Source/WebKit/qt/Api/qwebpage.cpp index 9e84eeeab..d9b00773b 100644 --- a/Source/WebKit/qt/Api/qwebpage.cpp +++ b/Source/WebKit/qt/Api/qwebpage.cpp @@ -2143,7 +2143,7 @@ bool QWebPage::javaScriptPrompt(QWebFrame *frame, const QString& msg, const QStr // double the &'s because single & will underline the following character // (Accelerator mnemonics) QString escMsg(msg); - escMsg.replace(QChar::fromAscii('&'), QString::fromAscii("&&")); + escMsg.replace(QChar::fromLatin1('&'), QLatin1String("&&")); dlg.setLabelText(escMsg); dlg.setTextEchoMode(QLineEdit::Normal); -- cgit v1.2.1