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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 879777f1a70ef0a581a4449fed813bc5337753d1
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 14:30:50 2010 +0000

    2010-10-05  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r69103.
            http://trac.webkit.org/changeset/69103
            https://bugs.webkit.org/show_bug.cgi?id=47177
    
            Breaking Windows and Mac build. (Requested by lca on #webkit).
    
            * 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@69107 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 744725d..29bf68d 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-05  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r69103.
+        http://trac.webkit.org/changeset/69103
+        https://bugs.webkit.org/show_bug.cgi?id=47177
+
+        Breaking Windows and Mac build. (Requested by lca on #webkit).
+
+        * UIProcess/API/C/WKNativeEvent.h:
+        * UIProcess/API/qt/qwkpage.cpp:
+        * UIProcess/API/qt/qwkpage.h:
+        * WebKit2.pri:
+
 2010-10-05  Luiz Agostini  <luiz.agostini at openbossa.org>
 
         Reviewed by Antti Koivisto.
diff --git a/WebKit2/UIProcess/API/C/WKNativeEvent.h b/WebKit2/UIProcess/API/C/WKNativeEvent.h
index 40ac8ab..e15f4c5 100644
--- a/WebKit2/UIProcess/API/C/WKNativeEvent.h
+++ b/WebKit2/UIProcess/API/C/WKNativeEvent.h
@@ -30,10 +30,6 @@
 extern "C" {
 #endif
 
-#if PLATFORM(QT)
-class QEvent;
-typedef const QEvent* WKNativeEventPtr;
-#else
 #ifdef __APPLE__
 #ifdef __OBJC__
 @class NSEvent;
@@ -46,7 +42,6 @@ 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 f6be15f..5c816f3 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -38,11 +38,10 @@
 #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 7542b57..b96e04a 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.h
+++ b/WebKit2/UIProcess/API/qt/qwkpage.h
@@ -8,6 +8,8 @@
 #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 103fed1..c9c6e52 100644
--- a/WebKit2/WebKit2.pri
+++ b/WebKit2/WebKit2.pri
@@ -14,8 +14,7 @@ defineTest(addWebKit2Lib) {
     QMAKE_LIBDIR += $$pathToWebKit2Output
 
     # Make symbols visible
-    mac:QMAKE_LFLAGS += -Wl,-all_load -l$$WEBKIT2_TARGET
-    else:QMAKE_LFLAGS += -Wl,-whole-archive -l$$WEBKIT2_TARGET -Wl,-no-whole-archive
+    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