summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebKit/qt/ChangeLog
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-31 22:01:12 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-31 22:01:12 (GMT)
commitc9bb16f0b34f180bf955682ab31fc1ff63d5de84 (patch)
treece89dcdfb95553e2a06ad29bdd7f3ded1f2e6507 /src/3rdparty/webkit/WebKit/qt/ChangeLog
parent6750d0dcbf5a2e88fab2e127dc3e057f0d68bf71 (diff)
parent51f56d93578be5021fe449da1165cf0c539343b9 (diff)
downloadQt-c9bb16f0b34f180bf955682ab31fc1ff63d5de84.zip
Qt-c9bb16f0b34f180bf955682ab31fc1ff63d5de84.tar.gz
Qt-c9bb16f0b34f180bf955682ab31fc1ff63d5de84.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to c58dc2f491a824ac56e31c440fcf7fe16dab09c4
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/ChangeLog')
-rw-r--r--src/3rdparty/webkit/WebKit/qt/ChangeLog21
1 files changed, 21 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog
index cc2d39a..b6cbf92 100644
--- a/src/3rdparty/webkit/WebKit/qt/ChangeLog
+++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog
@@ -1,3 +1,24 @@
+2010-05-31 Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
+
+ Reviewed by Simon Hausmann.
+
+ [Qt] Escape backslashes in the .pro files
+
+ qmake in Qt 4.7 warns about unescaped backspaces and deprecates them.
+
+ * Api/DerivedSources.pro:
+ * docs/docs.pri:
+
+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-28 Antti Koivisto <koivisto@iki.fi>
Reviewed by Kenneth Rohde Christiansen.