[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 2bd5f6b86e7da5f0d481baa7a6a77125a519caf2
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 12 18:15:17 2010 +0000

    [Qt] Last bits and pieces for a V8 build.
    
    Reviewed by Andreas Kling.
    
    When building with V8, get it from QtScript.
    
    * WebCore.pro: Use QtScript, removed non-existant
    bridge files from the build.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67334 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a897aae..7c19f63 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,17 @@
 
         Reviewed by Andreas Kling.
 
+        [Qt] Last bits and pieces for a V8 build.
+
+        When building with V8, get it from QtScript.
+
+        * WebCore.pro: Use QtScript, removed non-existant
+        bridge files from the build.
+
+2010-09-12  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Andreas Kling.
+
         [Qt] Add PlatformBridge for V8 build.
 
         Add the minimalisting platform bridge with the two
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index da2d5e9..2c04835 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -6,9 +6,10 @@ meegotouch {
     DEFINES += WTF_USE_MEEGOTOUCH=1
 }
 
-v8 {
-    # Take v8 location from environment
-    V8_INCLUDE_DIR = $$(V8_INCLUDE_DIR)
+v8:exists($$[QT_INSTALL_PREFIX]/src/3rdparty/v8/include/v8.h) {
+    message(Using V8 with QtScript)
+    QT += script
+    INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/v8/include
 
     DEFINES *= V8_BINDING=1
     DEFINES += WTF_CHANGES=1
@@ -75,14 +76,6 @@ symbian: {
     CONFIG(release, debug|release): QMAKE_CXXFLAGS.ARMCC += -OTime -O3
 }
 
-v8 {
-    win32-* {
-        LIBS += -lWs2_32
-        LIBS += -lwinmm
-    }
-    LIBS += -lv8
-}
-
 isEmpty(OUTPUT_DIR): OUTPUT_DIR = ..
 include($$PWD/../WebKit.pri)
 
@@ -205,7 +198,6 @@ include(WebCore.pri)
 
 v8 {
     WEBCORE_INCLUDEPATH = \
-        $$V8_INCLUDE_DIR \
         $$PWD/bindings/v8 \
         $$PWD/bindings/v8/custom \
         $$PWD/bindings/v8/specialization \
@@ -2517,17 +2509,10 @@ HEADERS += \
 
 v8 {
     SOURCES += \
-       platform/qt/PlatformBridgeQt.cpp \
-       bridge/qt/v8/qt_instancev8.cpp \
-       bridge/qt/v8/qt_pixmapruntimev8.cpp \
-       bridge/qt/v8/qt_runtimev8.cpp
+       platform/qt/PlatformBridgeQt.cpp
 } else {
     SOURCES += \
        bindings/js/ScriptControllerQt.cpp \
-       bridge/qt/qt_class.cpp \
-       bridge/qt/qt_instance.cpp \
-       bridge/qt/qt_pixmapruntime.cpp \
-       bridge/qt/qt_runtime.cpp
 }
 
 SOURCES += \

-- 
WebKit Debian packaging