diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-31 17:43:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-31 17:43:44 (GMT) |
| commit | 9f3548b983aaac50a1ef638fece2e97145aa212b (patch) | |
| tree | b770e72414feec14423a43d078333598fe753c07 | |
| parent | 7a6a47255a858d6d0ea14158cc83125c2d4440dc (diff) | |
| parent | 704dfe0bf4a85cb203a6bb84ab2a3db0b92d3d6b (diff) | |
| download | Qt-9f3548b983aaac50a1ef638fece2e97145aa212b.zip Qt-9f3548b983aaac50a1ef638fece2e97145aa212b.tar.gz Qt-9f3548b983aaac50a1ef638fece2e97145aa212b.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( b9dcd9c168d9b25deb020837a67f30c2d72c9afb )
| -rw-r--r-- | src/3rdparty/webkit/VERSION | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/ChangeLog | 10 |
3 files changed, 12 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index 8a524b8..b57b607 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -8,4 +8,4 @@ The commit imported was from the and has the sha1 checksum - 3bb0df4f00fa0b3ac3abc1b6fe508080fabdeaab + b9dcd9c168d9b25deb020837a67f30c2d72c9afb 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(") ")); diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog index 3a1735f..5d37901 100644 --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog @@ -1,3 +1,13 @@ +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): + 2010-05-12 Joe Ligman <joseph.ligman@nokia.com> Reviewed by Laszlo Gombos. |