diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-31 13:06:33 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-31 13:06:33 (GMT) |
| commit | 704dfe0bf4a85cb203a6bb84ab2a3db0b92d3d6b (patch) | |
| tree | 240eab34286915a0a381161c7e901fd19723bd18 /src/3rdparty/webkit/WebKit/qt/Api | |
| parent | 1cb57b02000521b2494b6ec77dd3f8cde1bc6635 (diff) | |
| download | Qt-704dfe0bf4a85cb203a6bb84ab2a3db0b92d3d6b.zip Qt-704dfe0bf4a85cb203a6bb84ab2a3db0b92d3d6b.tar.gz Qt-704dfe0bf4a85cb203a6bb84ab2a3db0b92d3d6b.tar.bz2 | |
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( b9dcd9c168d9b25deb020837a67f30c2d72c9afb )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2010-05-19 Denis Dzyubenko <denis.dzyubenko@nokia.com>
Reviewed by Kenneth Rohde Christiansen.
When creating the UA, do not sassmue the language code is a
two-letter iso639-1 code.
* Api/qwebpage.cpp:
(QWebPage::userAgentForUrl):
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/Api')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp index 5fb64a7..ff92f0b 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp @@ -3293,7 +3293,7 @@ QString QWebPage::userAgentForUrl(const QUrl& url) const if (view()) locale = view()->locale(); QString name = locale.name(); - name[2] = QLatin1Char('-'); + name.replace(QLatin1Char('_'), QLatin1Char('-')); ua.append(name); ua.append(QLatin1String(") ")); |