summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/ChangeLog
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-26 13:30:24 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-26 13:30:24 (GMT)
commite7f0ff73d15b70da04fb53d0cdb1627f3045fa1a (patch)
tree042ddcdbad2b8f8558d0edcd81c90a092b375b78 /src/3rdparty/webkit/ChangeLog
parent4837518d3161c77b4e811057d638dcbd22b89195 (diff)
parentc45b73eaf3a64f24730b1692fda365f3e30645cb (diff)
downloadQt-e7f0ff73d15b70da04fb53d0cdb1627f3045fa1a.zip
Qt-e7f0ff73d15b70da04fb53d0cdb1627f3045fa1a.tar.gz
Qt-e7f0ff73d15b70da04fb53d0cdb1627f3045fa1a.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 807157e42add842605ec67d9363dd3f1861748ca
Diffstat (limited to 'src/3rdparty/webkit/ChangeLog')
-rw-r--r--src/3rdparty/webkit/ChangeLog12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/ChangeLog b/src/3rdparty/webkit/ChangeLog
index 8f9c7ac..c2862fd 100644
--- a/src/3rdparty/webkit/ChangeLog
+++ b/src/3rdparty/webkit/ChangeLog
@@ -1,3 +1,15 @@
+2010-05-04 Laszlo Gombos <laszlo.1.gombos@nokia.com>
+
+ Unreviewed, build fix for Symbian.
+
+ [Symbian] Symbian builds does not support shadow builds
+
+ Revision r54715 broke the Symbian build. For Symbian
+ the include directory is generated in the root of the source tree.
+ This patch sets the INCLUDEPATH accordingly for Symbian.
+
+ * WebKit.pri:
+
2010-05-14 Simon Hausmann <simon.hausmann@nokia.com>
Rubber-stamped by Antti Koivisto.