[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

aroben at apple.com aroben at apple.com
Thu Apr 8 00:42:21 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 0adbdfb632c6aee900ddc0691457d2f6a2f03717
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 18 17:52:35 2009 +0000

    Qt build fix
    
    WebCore:
    
    * platform/qt/RenderThemeQt.cpp:
    * plugins/qt/PluginDataQt.cpp:
    * plugins/qt/PluginViewQt.cpp:
    Added #includes.
    
    WebKit/qt:
    
    * Api/qwebpage.cpp:
    Added #includes.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52319 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3877785..eecb3f7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
 2009-12-18  Adam Roben  <aroben at apple.com>
 
+        Qt build fix
+
+        * platform/qt/RenderThemeQt.cpp:
+        * plugins/qt/PluginDataQt.cpp:
+        * plugins/qt/PluginViewQt.cpp:
+        Added #includes.
+
+2009-12-18  Adam Roben  <aroben at apple.com>
+
         V8 build fix
 
         * bindings/v8/custom/V8DOMWindowCustom.cpp: Added #include.
diff --git a/WebCore/platform/qt/RenderThemeQt.cpp b/WebCore/platform/qt/RenderThemeQt.cpp
index 501a28b..74120d3 100644
--- a/WebCore/platform/qt/RenderThemeQt.cpp
+++ b/WebCore/platform/qt/RenderThemeQt.cpp
@@ -32,6 +32,7 @@
 
 #include "CSSStyleSelector.h"
 #include "CSSStyleSheet.h"
+#include "Chrome.h"
 #include "ChromeClientQt.h"
 #include "Color.h"
 #include "Document.h"
diff --git a/WebCore/plugins/qt/PluginDataQt.cpp b/WebCore/plugins/qt/PluginDataQt.cpp
index a836937..188365a 100644
--- a/WebCore/plugins/qt/PluginDataQt.cpp
+++ b/WebCore/plugins/qt/PluginDataQt.cpp
@@ -24,6 +24,7 @@
 #include "PluginDatabase.h"
 #include "PluginPackage.h"
 
+#include "Chrome.h"
 #include "ChromeClientQt.h"
 #include "Page.h"
 #include <qwebpage.h>
diff --git a/WebCore/plugins/qt/PluginViewQt.cpp b/WebCore/plugins/qt/PluginViewQt.cpp
index 063a7e5..b4ee48e 100644
--- a/WebCore/plugins/qt/PluginViewQt.cpp
+++ b/WebCore/plugins/qt/PluginViewQt.cpp
@@ -41,6 +41,7 @@
 #include "GraphicsContext.h"
 #include "HTMLNames.h"
 #include "HTMLPlugInElement.h"
+#include "HostWindow.h"
 #include "Image.h"
 #include "JSDOMBinding.h"
 #include "KeyboardEvent.h"
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index 3409591..c752a81 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -32,6 +32,7 @@
 #include "qwebsettings.h"
 #include "qwebkitversion.h"
 
+#include "Chrome.h"
 #include "Frame.h"
 #include "FrameTree.h"
 #include "FrameLoader.h"
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 1d806dd..7573107 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-18  Adam Roben  <aroben at apple.com>
+
+        Qt build fix
+
+        * Api/qwebpage.cpp:
+        Added #includes.
+
 2009-12-18  Joe Ligman  <joseph.ligman at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list