[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

abarth at webkit.org abarth at webkit.org
Fri Jan 21 14:50:48 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit dbff2afb7d7a18b685bafd985fdbb1314cce17b2
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 2 07:52:36 2011 +0000

    2011-01-01  Adam Barth  <abarth at webkit.org>
    
            Speculative build fix for Qt.  Add some more include paths.
    
            * WebKit2.pro:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74862 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index f60c9ec..04921b1 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,11 @@
 2011-01-01  Adam Barth  <abarth at webkit.org>
 
+        Speculative build fix for Qt.  Add some more include paths.
+
+        * WebKit2.pro:
+
+2011-01-01  Adam Barth  <abarth at webkit.org>
+
         Reviewed by Eric Seidel.
 
         Move JavaScriptCore to Source
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index e90698a..64938d7 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -34,7 +34,11 @@ DESTDIR = $$WEBKIT2_DESTDIR
 mac: CONFIG += build_all
 
 INCLUDEPATH = \
-    $$PWD/.. \
+    $$PWD/.. \ # FIXME: Remove this include once we move all the source to Source.
+    $$PWD/../Source \
+    $$INCLUDEPATH
+
+INCLUDEPATH = \
     $$PWD/../Source/JavaScriptCore \
     $$PWD/../Source/JavaScriptCore/assembler \
     $$PWD/../Source/JavaScriptCore/bytecode \

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list