[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[kbalazs at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 9411f803b5c6f4ba733e94cba3808766a1bc45f2
Author: kbalazs at webkit.org <kbalazs at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 30 20:25:33 2011 +0000

    2011-01-30  Balazs Kelemen  <kbalazs at webkit.org>
    
            Reviewed by Csaba Osztrogonác.
    
            [Qt][WK2]REGRESSION (r76991): Fix build errors
            https://bugs.webkit.org/show_bug.cgi?id=53400
    
            Revert the temporary build fix (http://trac.webkit.org/changeset/77088)
            and remove WebKit2Prefix.h from the build.
            * UIProcess/API/qt/qwkhistory.h:
            * UIProcess/API/qt/qwkpage.h:
            * WebKit2.pro:
    2011-01-30  Balazs Kelemen  <kbalazs at webkit.org>
    
            Reviewed by Csaba Osztrogonác.
    
            [Qt][WK2]REGRESSION (r76991): Fix build errors
            https://bugs.webkit.org/show_bug.cgi?id=53400
    
            Revert the temporary build fix (http://trac.webkit.org/changeset/77088)
            and remove WebKit2Prefix.h from the build.
            * MiniBrowser/qt/MiniBrowser.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77092 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index daecbb2..2ce4869 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-30  Balazs Kelemen  <kbalazs at webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt][WK2]REGRESSION (r76991): Fix build errors
+        https://bugs.webkit.org/show_bug.cgi?id=53400
+
+        Revert the temporary build fix (http://trac.webkit.org/changeset/77088)
+        and remove WebKit2Prefix.h from the build.
+        * UIProcess/API/qt/qwkhistory.h:
+        * UIProcess/API/qt/qwkpage.h:
+        * WebKit2.pro:
+
 2011-01-30  Jeff Miller  <jeffm at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/Source/WebKit2/UIProcess/API/qt/qwkhistory.h b/Source/WebKit2/UIProcess/API/qt/qwkhistory.h
index 678466d..81081c9 100644
--- a/Source/WebKit2/UIProcess/API/qt/qwkhistory.h
+++ b/Source/WebKit2/UIProcess/API/qt/qwkhistory.h
@@ -25,7 +25,6 @@
 #ifndef qwkhistory_h
 #define qwkhistory_h
 
-#include "config.h"
 #include "qwebkitglobal.h"
 #include <QObject>
 #include <QSharedData>
diff --git a/Source/WebKit2/UIProcess/API/qt/qwkpage.h b/Source/WebKit2/UIProcess/API/qt/qwkpage.h
index e57684f..cb7933a 100644
--- a/Source/WebKit2/UIProcess/API/qt/qwkpage.h
+++ b/Source/WebKit2/UIProcess/API/qt/qwkpage.h
@@ -1,7 +1,6 @@
 #ifndef qwkpage_h
 #define qwkpage_h
 
-#include "config.h"
 #include "qwebkitglobal.h"
 #include <QAction>
 #include <QObject>
diff --git a/Source/WebKit2/WebKit2.pro b/Source/WebKit2/WebKit2.pro
index 9b72fcf..b2f3b16 100644
--- a/Source/WebKit2/WebKit2.pro
+++ b/Source/WebKit2/WebKit2.pro
@@ -170,9 +170,6 @@ symbian {
     INCLUDEPATH = $$WEBKIT2_INCLUDEPATH $$INCLUDEPATH
 }
 
-PREFIX_HEADER = $$PWD/../WebKit2/WebKit2Prefix.h
-*-g++*:QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
-
 WEBKIT2_GENERATED_HEADERS = \
     $$WEBKIT2_GENERATED_SOURCES_DIR/AuthenticationManagerMessages.h \
     $$WEBKIT2_GENERATED_SOURCES_DIR/DownloadProxyMessages.h \
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 2383d35..dd7c7b6 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-30  Balazs Kelemen  <kbalazs at webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt][WK2]REGRESSION (r76991): Fix build errors
+        https://bugs.webkit.org/show_bug.cgi?id=53400
+
+        Revert the temporary build fix (http://trac.webkit.org/changeset/77088)
+        and remove WebKit2Prefix.h from the build.
+        * MiniBrowser/qt/MiniBrowser.pro:
+
 2011-01-30  Csaba Osztrogonác  <ossy at webkit.org>
 
         Unreviewed.
diff --git a/Tools/MiniBrowser/qt/MiniBrowser.pro b/Tools/MiniBrowser/qt/MiniBrowser.pro
index 8b60405..84bbb33 100644
--- a/Tools/MiniBrowser/qt/MiniBrowser.pro
+++ b/Tools/MiniBrowser/qt/MiniBrowser.pro
@@ -16,7 +16,6 @@ isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../..
 include(../../../Source/WebKit.pri)
 
 INCLUDEPATH += \
-    $$PWD/../../../Source/JavaScriptCore \
     $$PWD/../../../Source/WebKit2/ \
     $$PWD/../../../Source/WebKit2/UIProcess/API/cpp \
     $$PWD/../../../Source/WebKit2/UIProcess/API/C \

-- 
WebKit Debian packaging