diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-09-07 17:09:26 +0200 |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-09 15:36:16 +1000 |
| commit | 95d7942b190cd13e2c1312c66a6c19b2f4bc1f40 (patch) | |
| tree | fa533bea6ed8a26025a8616d3b27b78c4e869138 | |
| parent | e4c8b01efc9dedc79601d80911e8d8411f5e869c (diff) | |
QtWebKit: Update tag files to match the same content on qtwebkit.git
NOTE: Some patches have been made in the 4.7.0 branch for
src/3rdparty/webkit that are not available upstream.
This shouldn't have happened, however these patches mostly
address issues regarding builds of QtWebKit inside the Qt
source tree so it doesn't matter so much regarding source packages.
Reviewed-by: Simon Hausmann
(cherry picked from commit cb23007c0e04e8d23b426ca1a3672f70282012c7)
| -rw-r--r-- | src/3rdparty/webkit/.tag | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/VERSION | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag index d31a2b4c66..11483200bf 100644 --- a/src/3rdparty/webkit/.tag +++ b/src/3rdparty/webkit/.tag @@ -1 +1 @@ -72b1c38579ca1fdb3f242e29cd16e5bfb4925813 +460b651cbe4f6994b492ff08614e57b0e31a24c8 diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index 62aa8ce9dd..aff3f2a183 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from and has the sha1 checksum - 72b1c38579ca1fdb3f242e29cd16e5bfb4925813 + 460b651cbe4f6994b492ff08614e57b0e31a24c8 |