diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-27 21:51:42 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-27 21:51:42 +0200 |
commit | be01689f43cf6882cf670d33df49ead1f570c53a (patch) | |
tree | 4bb2161d8983b38e3e7ed37b4a50303bfd5e2e85 /Source/WebKit/qt/Api/qwebpage.cpp | |
parent | a89b2ebb8e192c5e8cea21079bda2ee2c0c7dddd (diff) | |
download | qtwebkit-be01689f43cf6882cf670d33df49ead1f570c53a.tar.gz |
Imported WebKit commit 8d6c5efc74f0222dfc7bcce8d845d4a2707ed9e6 (http://svn.webkit.org/repository/webkit/trunk@118629)
Diffstat (limited to 'Source/WebKit/qt/Api/qwebpage.cpp')
-rw-r--r-- | Source/WebKit/qt/Api/qwebpage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |