diff options
| author | Alexis Menard <alexis.menard@trolltech.com> | 2011-06-20 14:12:23 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@trolltech.com> | 2011-06-20 14:12:23 (GMT) |
| commit | 20ec7b41ac600fe670c3c8e6305cc12b10440c30 (patch) | |
| tree | 281ac97e64bddd0a9a4c3492ec643a34af73ed7f /src/3rdparty/webkit/Source/WebKit2 | |
| parent | fbdd5d5ad67535a47aa1ef3c08fdb6bb7a755671 (diff) | |
| download | Qt-20ec7b41ac600fe670c3c8e6305cc12b10440c30.zip Qt-20ec7b41ac600fe670c3c8e6305cc12b10440c30.tar.gz Qt-20ec7b41ac600fe670c3c8e6305cc12b10440c30.tar.bz2 | |
Updated WebKit to 0de6fbe7d7714e4d2520f84a7d7e0c5ed9a55114
Diffstat (limited to 'src/3rdparty/webkit/Source/WebKit2')
| -rw-r--r-- | src/3rdparty/webkit/Source/WebKit2/ChangeLog | 12 | ||||
| -rw-r--r-- | src/3rdparty/webkit/Source/WebKit2/WebKit2.pri | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/Source/WebKit2/ChangeLog b/src/3rdparty/webkit/Source/WebKit2/ChangeLog index f25333d..b7eaf3c 100644 --- a/src/3rdparty/webkit/Source/WebKit2/ChangeLog +++ b/src/3rdparty/webkit/Source/WebKit2/ChangeLog @@ -1,3 +1,15 @@ +2011-06-08 Yael Aharon <yael.aharon@nokia.com> + + Reviewed by Andreas Kling. + + [Qt] Build fix for building QtWebKit inside of Qt. + https://bugs.webkit.org/show_bug.cgi?id=62280 + + Remove CONFIG=staticlib, because it causes the configure script to add -lwebkit2 + into QtWebKit.prl. + + * WebKit2.pri: + 2011-05-24 Jer Noble <jer.noble@apple.com> Reviewed by Darin Adler. diff --git a/src/3rdparty/webkit/Source/WebKit2/WebKit2.pri b/src/3rdparty/webkit/Source/WebKit2/WebKit2.pri index de27da9..32c25e1 100644 --- a/src/3rdparty/webkit/Source/WebKit2/WebKit2.pri +++ b/src/3rdparty/webkit/Source/WebKit2/WebKit2.pri @@ -89,6 +89,7 @@ defineTest(prependWebKit2Lib) { # The following line is to prevent qmake from adding webkit2 to libQtWebKit's prl dependencies. CONFIG -= explicitlib + CONFIG -= staticlib export(QMAKE_LIBDIR) export(POST_TARGETDEPS) |