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

[hausmann at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit df870bc36c254bf9db5cfe0ae489503370ab270b
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 11 18:22:14 2010 +0000

    [Qt] V8 port: webkit project files changes
    https://bugs.webkit.org/show_bug.cgi?id=45140
    
    Reviewed by Andreas Kling.
    
    .:
    
    * WebKit.pro: Don't compile JavaScriptCore and jsc when
    building with v8.
    
    WebCore:
    
    * WebCore.pro: Removed unecessary common.pri inclusion from earlier patch.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67307 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 2c93611..0f66129 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-11  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] V8 port: webkit project files changes
+        https://bugs.webkit.org/show_bug.cgi?id=45140
+
+        * WebKit.pro: Don't compile JavaScriptCore and jsc when
+        building with v8.
+
 2010-09-11  Xan Lopez  <xlopez at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 826da67..6ca1728 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-11  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] V8 port: webkit project files changes
+        https://bugs.webkit.org/show_bug.cgi?id=45140
+
+        * WebCore.pro: Removed unecessary common.pri inclusion from earlier patch.
+
 2010-09-03  Vlad Burlik  <volodimir.burlik at nokia.com>, Simon Hausmann  <simon.hausmann at nokia.com>
 
         Reviewed by Andreas Kling.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 8c67ce6..714b810 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -1,6 +1,3 @@
-# Include to determine JS engine
-include(../common.pri)
-
 # WebCore - qmake build info
 CONFIG += building-libs
 CONFIG += depend_includepath
diff --git a/WebKit.pro b/WebKit.pro
index db102c4..9fd9c2e 100644
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -3,7 +3,7 @@ CONFIG += ordered
 
 include(WebKit.pri)
 
-SUBDIRS += JavaScriptCore
+!v8: SUBDIRS += JavaScriptCore
 webkit2 {
     SUBDIRS += WebKit2
 }
@@ -14,7 +14,7 @@ exists($$PWD/WebKitTools/QtTestBrowser): SUBDIRS += WebKitTools/QtTestBrowser
 contains(QT_CONFIG, declarative) {
     exists($$PWD/WebKit/qt/declarative): SUBDIRS += WebKit/qt/declarative
 }
-exists($$PWD/JavaScriptCore/jsc.pro): SUBDIRS += JavaScriptCore/jsc.pro
+!v8:exists($$PWD/JavaScriptCore/jsc.pro): SUBDIRS += JavaScriptCore/jsc.pro
 exists($$PWD/WebKit/qt/tests): SUBDIRS += WebKit/qt/tests
 exists($$PWD/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro): SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
 exists($$PWD/WebKitTools/DumpRenderTree/qt/ImageDiff.pro): SUBDIRS += WebKitTools/DumpRenderTree/qt/ImageDiff.pro

-- 
WebKit Debian packaging