[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 c14215c37af94d23cb6db23af4f1e18f557d7253
Author: luiz at webkit.org <luiz at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 13:18:15 2010 +0000

    2010-10-05  Luiz Agostini  <luiz.agostini at openbossa.org>
    
            Reviewed by Antti Koivisto.
    
            [Qt] Webkit2 MacOS build fix
            https://bugs.webkit.org/show_bug.cgi?id=47167
    
            Qt WebKit2 MacOS build fix.
    
            * UIProcess/API/C/WKNativeEvent.h:
            * UIProcess/API/qt/qwkpage.cpp:
            * UIProcess/API/qt/qwkpage.h:
            * WebKit2.pri:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69103 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index f9485b7..744725d 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-05  Luiz Agostini  <luiz.agostini at openbossa.org>
+
+        Reviewed by Antti Koivisto.
+
+        [Qt] Webkit2 MacOS build fix
+        https://bugs.webkit.org/show_bug.cgi?id=47167
+
+        Qt WebKit2 MacOS build fix.
+
+        * UIProcess/API/C/WKNativeEvent.h:
+        * UIProcess/API/qt/qwkpage.cpp:
+        * UIProcess/API/qt/qwkpage.h:
+        * WebKit2.pri:
+
 2010-10-04  Mark Rowe  <mrowe at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit2/UIProcess/API/C/WKNativeEvent.h b/WebKit2/UIProcess/API/C/WKNativeEvent.h
index e15f4c5..40ac8ab 100644
--- a/WebKit2/UIProcess/API/C/WKNativeEvent.h
+++ b/WebKit2/UIProcess/API/C/WKNativeEvent.h
@@ -30,6 +30,10 @@
 extern "C" {
 #endif
 
+#if PLATFORM(QT)
+class QEvent;
+typedef const QEvent* WKNativeEventPtr;
+#else
 #ifdef __APPLE__
 #ifdef __OBJC__
 @class NSEvent;
@@ -42,6 +46,7 @@ typedef const struct tagMSG* WKNativeEventPtr;
 #else
 typedef const void* WKNativeEventPtr;
 #endif
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index 5c816f3..f6be15f 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -38,10 +38,11 @@
 #include <QStyle>
 #include <QTouchEvent>
 #include <QtDebug>
+#include <WebKit2/WKBase.h>
 #include <WebKit2/WKFrame.h>
+#include <WebKit2/WKPage.h>
 #include <WebKit2/WKRetainPtr.h>
 
-
 using namespace WebKit;
 using namespace WebCore;
 
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.h b/WebKit2/UIProcess/API/qt/qwkpage.h
index b96e04a..7542b57 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.h
+++ b/WebKit2/UIProcess/API/qt/qwkpage.h
@@ -8,8 +8,6 @@
 #include <QRect>
 #include <QSize>
 #include <QUrl>
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKPage.h>
 #include <WebKit2/WKPageNamespace.h>
 
 class QCursor;
diff --git a/WebKit2/WebKit2.pri b/WebKit2/WebKit2.pri
index c9c6e52..103fed1 100644
--- a/WebKit2/WebKit2.pri
+++ b/WebKit2/WebKit2.pri
@@ -14,7 +14,8 @@ defineTest(addWebKit2Lib) {
     QMAKE_LIBDIR += $$pathToWebKit2Output
 
     # Make symbols visible
-    QMAKE_LFLAGS += -Wl,-whole-archive -l$$WEBKIT2_TARGET -Wl,-no-whole-archive
+    mac:QMAKE_LFLAGS += -Wl,-all_load -l$$WEBKIT2_TARGET
+    else:QMAKE_LFLAGS += -Wl,-whole-archive -l$$WEBKIT2_TARGET -Wl,-no-whole-archive
 
     POST_TARGETDEPS += $${pathToWebKit2Output}$${QMAKE_DIR_SEP}lib$${WEBKIT2_TARGET}.a
 

-- 
WebKit Debian packaging