summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-05-31 13:06:33 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2010-06-01 01:36:51 (GMT)
commit76353f177cd84327c692ea31ec644df683643194 (patch)
tree754dfe4584941dc1bb9639bf40580e4d7d0a8279
parent7d7b2e488d8fff1fba4c818ca347b89835fd4e71 (diff)
downloadQt-76353f177cd84327c692ea31ec644df683643194.zip
Qt-76353f177cd84327c692ea31ec644df683643194.tar.gz
Qt-76353f177cd84327c692ea31ec644df683643194.tar.bz2
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( b9dcd9c168d9b25deb020837a67f30c2d72c9afb )v4.6.3
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): (cherry picked from commit 704dfe0bf4a85cb203a6bb84ab2a3db0b92d3d6b)
-rw-r--r--src/3rdparty/webkit/VERSION2
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp2
-rw-r--r--src/3rdparty/webkit/WebKit/qt/ChangeLog10
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.