diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-26 21:30:13 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-26 21:30:13 (GMT) |
commit | b0ede5363b8be9e5ca66576acfd78ecd9697ba80 (patch) | |
tree | 7dfcd2e478c0b6e7551b337db14c6987099956e0 /src/3rdparty/webkit/ChangeLog | |
parent | 84f35321b867894470391d4997b5d58e34bce0ed (diff) | |
parent | e7f0ff73d15b70da04fb53d0cdb1627f3045fa1a (diff) | |
download | Qt-b0ede5363b8be9e5ca66576acfd78ecd9697ba80.zip Qt-b0ede5363b8be9e5ca66576acfd78ecd9697ba80.tar.gz Qt-b0ede5363b8be9e5ca66576acfd78ecd9697ba80.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/ChangeLog | 12 |
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. |