summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@nokia.com>2010-09-07 15:09:26 (GMT)
committerJocelyn Turcotte <jocelyn.turcotte@nokia.com>2010-09-08 08:15:54 (GMT)
commitcb23007c0e04e8d23b426ca1a3672f70282012c7 (patch)
tree56a58f17472581c35e48e718ca4dd27e6dc9e572
parentd027395181d3e0c5796340ff87f2cddb41b93d29 (diff)
downloadQt-cb23007c0e04e8d23b426ca1a3672f70282012c7.zip
Qt-cb23007c0e04e8d23b426ca1a3672f70282012c7.tar.gz
Qt-cb23007c0e04e8d23b426ca1a3672f70282012c7.tar.bz2
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
-rw-r--r--src/3rdparty/webkit/.tag2
-rw-r--r--src/3rdparty/webkit/VERSION2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index d31a2b4..1148320 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 62aa8ce..aff3f2a 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