[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[luiz at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit e8aebcf5a866ac61c634a597ee5f4974e10095cb
Author: luiz at webkit.org <luiz at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 19 15:28:55 2010 +0000

    2010-10-19  Luiz Agostini  <luiz.agostini at openbossa.org>
    
            Reviewed by Antti Koivisto.
    
            [Qt] WebKit2 MacOS build fix
            https://bugs.webkit.org/show_bug.cgi?id=47897
    
            Qt WebKit2 MacOS build fix.
    
            * bridge/npapi.h:
    2010-10-19  Luiz Agostini  <luiz.agostini at openbossa.org>
    
            Reviewed by Antti Koivisto.
    
            [Qt] WebKit2 MacOS build fix
            https://bugs.webkit.org/show_bug.cgi?id=47897
    
            Qt WebKit2 MacOS build fix.
    
            * UIProcess/WebPageProxy.cpp:
            * WebKit2.pri:
            * WebKit2.pro:
    2010-10-19  Luiz Agostini  <luiz.agostini at openbossa.org>
    
            Reviewed by Antti Koivisto.
    
            [Qt] WebKit2 MacOS build fix
            https://bugs.webkit.org/show_bug.cgi?id=47897
    
            Qt WebKit2 MacOS build fix.
    
            * WebKitTestRunner/PlatformWebView.h:
            * WebKitTestRunner/qt/TestControllerQt.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70060 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9fb1e54..fc89f23 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-19  Luiz Agostini  <luiz.agostini at openbossa.org>
+
+        Reviewed by Antti Koivisto.
+
+        [Qt] WebKit2 MacOS build fix
+        https://bugs.webkit.org/show_bug.cgi?id=47897
+
+        Qt WebKit2 MacOS build fix.
+
+        * bridge/npapi.h:
+
 2010-10-19  Philippe Normand  <pnormand at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/bridge/npapi.h b/WebCore/bridge/npapi.h
index b2fde12..7a3a933 100644
--- a/WebCore/bridge/npapi.h
+++ b/WebCore/bridge/npapi.h
@@ -513,6 +513,8 @@ typedef struct _NPPrint
 #if defined(XP_MACOSX)
 #ifndef NP_NO_CARBON
 typedef EventRecord NPEvent;
+#else
+typedef void*  NPEvent;
 #endif
 #elif defined(XP_SYMBIAN)
 typedef QEvent NPEvent;
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b83dc19..baf8874 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-19  Luiz Agostini  <luiz.agostini at openbossa.org>
+
+        Reviewed by Antti Koivisto.
+
+        [Qt] WebKit2 MacOS build fix
+        https://bugs.webkit.org/show_bug.cgi?id=47897
+
+        Qt WebKit2 MacOS build fix.
+
+        * UIProcess/WebPageProxy.cpp:
+        * WebKit2.pri:
+        * WebKit2.pro:
+
 2010-10-18  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index 3e9d1a7..17efff6 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -455,7 +455,7 @@ void WebPageProxy::terminateProcess()
     process()->terminate();
 }
 
-#if !PLATFORM(CF)
+#if !PLATFORM(CF) || defined(BUILDING_QT__)
 PassRefPtr<WebData> WebPageProxy::sessionStateData(WebPageProxySessionStateFilterCallback, void* context) const
 {
     // FIXME: Return session state data for saving Page state.
diff --git a/WebKit2/WebKit2.pri b/WebKit2/WebKit2.pri
index 2427fd8..3e81581 100644
--- a/WebKit2/WebKit2.pri
+++ b/WebKit2/WebKit2.pri
@@ -1,5 +1,7 @@
 # WebKit2 - Qt4 build info
 
+QT += network
+
 # Use a config-specific target to prevent parallel builds file clashes on Mac
 mac: CONFIG(debug, debug|release): WEBKIT2_TARGET = webkit2d
 else: WEBKIT2_TARGET = webkit2
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index d710369..797488c 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -12,7 +12,6 @@ TEMPLATE = lib
 CONFIG += staticlib
 TARGET = $$WEBKIT2_TARGET
 DESTDIR = $$WEBKIT2_DESTDIR
-QT += network
 
 !CONFIG(release, debug|release) {
     OBJECTS_DIR = obj/debug
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 17a7942..28cbb1b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-19  Luiz Agostini  <luiz.agostini at openbossa.org>
+
+        Reviewed by Antti Koivisto.
+
+        [Qt] WebKit2 MacOS build fix
+        https://bugs.webkit.org/show_bug.cgi?id=47897
+
+        Qt WebKit2 MacOS build fix.
+
+        * WebKitTestRunner/PlatformWebView.h:
+        * WebKitTestRunner/qt/TestControllerQt.cpp:
+
 2010-10-19  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/WebKitTestRunner/PlatformWebView.h b/WebKitTools/WebKitTestRunner/PlatformWebView.h
index 4d2618a..72de868 100644
--- a/WebKitTools/WebKitTestRunner/PlatformWebView.h
+++ b/WebKitTools/WebKitTestRunner/PlatformWebView.h
@@ -26,7 +26,14 @@
 #ifndef PlatformWebView_h
 #define PlatformWebView_h
 
-#if defined(__APPLE__) && __APPLE__
+#if defined(BUILDING_QT__)
+namespace WTR {
+class WebView;
+}
+typedef WTR::WebView* PlatformWKView;
+class QMainWindow;
+typedef QMainWindow* PlatformWindow;
+#elif defined(__APPLE__) && __APPLE__
 #if __OBJC__
 @class WKView;
 @class NSWindow;
@@ -39,13 +46,6 @@ typedef NSWindow* PlatformWindow;
 #elif defined(WIN32) || defined(_WIN32)
 typedef WKViewRef PlatformWKView;
 typedef HWND PlatformWindow;
-#elif defined(BUILDING_QT__)
-namespace WTR {
-class WebView;
-}
-typedef WTR::WebView* PlatformWKView;
-class QMainWindow;
-typedef QMainWindow* PlatformWindow;
 #endif
 
 namespace WTR {
diff --git a/WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp b/WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp
index de9934f..d3aee4a 100644
--- a/WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp
+++ b/WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp
@@ -26,6 +26,8 @@
 
 #include "TestController.h"
 
+#include "WKStringQt.h"
+
 #include <cstdlib>
 #include <QCoreApplication>
 #include <QEventLoop>

-- 
WebKit Debian packaging