From 0ce072e74aea546852b6bb4b7f0c0fe0e2678aa5 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Fri, 18 Jun 2010 11:23:44 +0200
Subject: Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5

* Build fixes from the trunk
---
 src/3rdparty/webkit/.tag                             |  2 +-
 src/3rdparty/webkit/VERSION                          |  2 +-
 src/3rdparty/webkit/WebKit.pro                       |  2 +-
 src/3rdparty/webkit/WebKit/ChangeLog                 |  8 ++++++++
 src/3rdparty/webkit/WebKit/qt/ChangeLog              | 20 ++++++++++++++++++++
 .../webkit/WebKit/qt/declarative/declarative.pro     |  2 +-
 .../WebKit/qt/declarative/qdeclarativewebview.cpp    |  8 ++++----
 .../WebKit/qt/declarative/qdeclarativewebview_p.h    |  4 ++--
 8 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index 2a95aee..c7b77a6 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-c6f08f4c13f88491a5d1ae1794c72166af0c26ba
+d7a095a2a9514e1f132b779b99279585820b46f5
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index 2134b58..dc50465 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
 
-        c6f08f4c13f88491a5d1ae1794c72166af0c26ba
+        d7a095a2a9514e1f132b779b99279585820b46f5
diff --git a/src/3rdparty/webkit/WebKit.pro b/src/3rdparty/webkit/WebKit.pro
index 5a33bf7..c7df391 100644
--- a/src/3rdparty/webkit/WebKit.pro
+++ b/src/3rdparty/webkit/WebKit.pro
@@ -9,7 +9,7 @@ SUBDIRS += \
 
 # If the source exists, built it
 exists($$PWD/WebKitTools/QtTestBrowser): SUBDIRS += WebKitTools/QtTestBrowser
-greaterThan(QT_MINOR_VERSION, 6) {
+contains(QT_CONFIG, declarative) {
     exists($$PWD/WebKit/qt/declarative): SUBDIRS += WebKit/qt/declarative
 }
 exists($$PWD/JavaScriptCore/jsc.pro): SUBDIRS += JavaScriptCore/jsc.pro
diff --git a/src/3rdparty/webkit/WebKit/ChangeLog b/src/3rdparty/webkit/WebKit/ChangeLog
index bee3298..0bf9bed 100644
--- a/src/3rdparty/webkit/WebKit/ChangeLog
+++ b/src/3rdparty/webkit/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-18  Alexis Menard  <alexis.menard@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [qt] Better check for the declarative plugin inclusion.
+
+        * WebKit.pro:
+
 2010-03-22  Kevin Decker  <kdecker@apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog
index 113202b..987dc12 100644
--- a/src/3rdparty/webkit/WebKit/qt/ChangeLog
+++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog
@@ -1,3 +1,23 @@
+2010-06-18  Alexis Menard  <alexis.menard@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Change the target path to QtWebKit.
+
+        * declarative/declarative.pro:
+
+2010-06-17  Robert Hogan  <robert@webkit.org>
+
+        [Qt] Build fix
+
+        Unreviewed.
+
+        Remove includes in qdeclarativewebview*.* that rely on an installation
+        of QtWebKit.
+
+        * declarative/qdeclarativewebview.cpp:
+        * declarative/qdeclarativewebview_p.h:
+
 2010-06-17  Alexis Menard  <alexis.menard@nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro b/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro
index 9c15529..924329a 100644
--- a/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro
+++ b/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro
@@ -1,5 +1,5 @@
 TARGET  = qmlwebkitplugin
-TARGETPATH = org/webkit
+TARGETPATH = QtWebKit
 
 TEMPLATE = lib
 CONFIG += qt plugin
diff --git a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
index f8e1767..0d2800f 100644
--- a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
@@ -31,10 +31,10 @@
 #include <QtGui/QKeyEvent>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QPen>
-#include <QtWebKit/QWebElement>
-#include <QtWebKit/QWebFrame>
-#include <QtWebKit/QWebPage>
-#include <QtWebKit/QWebSettings>
+#include "qwebelement.h"
+#include "qwebframe.h"
+#include "qwebpage.h"
+#include "qwebsettings.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview_p.h b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview_p.h
index 1dca96d..3c3f889 100644
--- a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview_p.h
+++ b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview_p.h
@@ -26,8 +26,8 @@
 #include <QtDeclarative/QDeclarativeItem>
 #include <QtGui/QAction>
 #include <QtNetwork/QNetworkAccessManager>
-#include <QtWebKit/QGraphicsWebView>
-#include <QtWebKit/QWebPage>
+#include "qgraphicswebview.h"
+#include "qwebpage.h"
 
 
 QT_BEGIN_HEADER
-- 
cgit v0.12