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

    Fix the build with V8.
    
    Reviewed by Andreas Kling.
    
    This is a temporary kludge until the scriptworld stuff is properly
    ported, as part of the upcoming DRT work.
    
    * Api/qwebscriptworld.cpp:
    (QWebScriptWorld::QWebScriptWorld):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67332 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebscriptworld.cpp b/WebKit/qt/Api/qwebscriptworld.cpp
index 84b678d..74ab651 100644
--- a/WebKit/qt/Api/qwebscriptworld.cpp
+++ b/WebKit/qt/Api/qwebscriptworld.cpp
@@ -32,7 +32,9 @@ using namespace WebCore;
 */
 QWebScriptWorld::QWebScriptWorld()
 {
+#if USE(JSC)
     d = new QWebScriptWorldPrivate(ScriptController::createWorld());
+#endif
 }
 
 QWebScriptWorld::QWebScriptWorld(const QWebScriptWorld& other)
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index e3c8b98..315df18 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-12  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        Fix the build with V8.
+
+        This is a temporary kludge until the scriptworld stuff is properly
+        ported, as part of the upcoming DRT work.
+
+        * Api/qwebscriptworld.cpp:
+        (QWebScriptWorld::QWebScriptWorld):
+
 2010-09-11  Andreas Kling  <andreas.kling at nokia.com>
 
         Reviewed by Simon Hausmann.

-- 
WebKit Debian packaging