diff options
Diffstat (limited to 'src/3rdparty/webkit/ChangeLog')
| -rw-r--r-- | src/3rdparty/webkit/ChangeLog | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/ChangeLog b/src/3rdparty/webkit/ChangeLog index 9efa08f..1453e64 100644 --- a/src/3rdparty/webkit/ChangeLog +++ b/src/3rdparty/webkit/ChangeLog @@ -1,3 +1,32 @@ +2011-06-03 Alexis Menard <alexis.menard@openbossa.org> + + Reviewed by Benjamin Poulain. + + [Qt] Build fix of QtWebKit 2.2 when inside Qt tree with GCC 4.6. + https://bugs.webkit.org/show_bug.cgi?id=61957 + + When building inside the Qt source tree, qmake always append the mkspecs + defines after ours. We have to workaround and make sure that we append + our flags after the qmake variable used inside Qt. This workaround was provided + by our qmake folks. We need to append in both case because qmake behave differently + when called with -spec or via SUBDIR+=. + + * Source/WebKit.pri: + +2011-06-02 Alexis Menard <alexis.menard@openbossa.org> + + Reviewed by Andreas Kling. + + [Qt] Build fix of QtWebKit 2.2 when inside Qt tree with GCC 4.6. + https://bugs.webkit.org/show_bug.cgi?id=61957 + + When building inside the Qt source tree, qmake always append the mkspecs + defines after ours. We have to workaround and make sure that we append + our flags after the qmake variable used inside Qt. This workaround was provided + by our qmake folks. + + * Source/WebKit.pri: + 2011-05-05 Prasanth Ullattil <prasanth.ullattil@nokia.com> Reviewed by Simon Hausmann. |