From 9eb8387f7f2584b0828e91716bc2f20a2c6c74d4 Mon Sep 17 00:00:00 2001
From: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
Date: Thu, 11 Aug 2011 11:26:22 -0300
Subject: Updated WebKit to 8ed79cb10ca72b5d240beae674a7932963cbd007

Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
---
 src/3rdparty/webkit/.tag                                          | 2 +-
 src/3rdparty/webkit/Source/WebCore/ChangeLog                      | 8 ++++++++
 .../platform/graphics/gstreamer/PlatformVideoWindowPrivate.h      | 2 ++
 src/3rdparty/webkit/VERSION                                       | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index 2b42a20..5d17f94 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-66b76cdb8ef823f27a8229c5cae2d35e7f2d3c59
+8ed79cb10ca72b5d240beae674a7932963cbd007
diff --git a/src/3rdparty/webkit/Source/WebCore/ChangeLog b/src/3rdparty/webkit/Source/WebCore/ChangeLog
index 2e34c2e..a8fb182 100644
--- a/src/3rdparty/webkit/Source/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/Source/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-11  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Unreviewed build fix for Qt.
+
+        Make sure we build when Qt is namespaced.
+
+        * platform/graphics/gstreamer/PlatformVideoWindowPrivate.h:
+
 2011-08-06  Aron Rosenberg  <arosenberg@logitech.com>
 
         Reviewed by Benjamin Poulain.
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowPrivate.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowPrivate.h
index 7b441f4..eeb08c2 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowPrivate.h
+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowPrivate.h
@@ -23,7 +23,9 @@
 #include <QTimer>
 #include <QWidget>
 
+QT_BEGIN_NAMESPACE
 class QKeyEvent;
+QT_END_NAMESPACE
 
 namespace WebCore {
 
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index 3457752..515f393 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
 
-        66b76cdb8ef823f27a8229c5cae2d35e7f2d3c59
+        8ed79cb10ca72b5d240beae674a7932963cbd007
-- 
cgit v0.12