[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit e71435ec30526e8b6477e56f735516e5c7e14c91
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 2 07:31:22 2009 +0000

    Allow enabling and disabling of the JIT through a qmake variable.
    
    Patch by Jørgen Lind <jorgen.lind at nokia.com> on 2009-10-02
    Reviewed by Simon Hausmann.
    
    Qt's configure may set this variable through .qmake.cache if a
    commandline option is given and/or the compile test for hwcap.h
    failed/succeeded.
    
    * JavaScriptCore.pri:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49010 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 9914a91..4f53ba9 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-02  Jørgen Lind  <jorgen.lind at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        Allow enabling and disabling of the JIT through a qmake variable.
+
+        Qt's configure may set this variable through .qmake.cache if a
+        commandline option is given and/or the compile test for hwcap.h
+        failed/succeeded.
+
+        * JavaScriptCore.pri:
+
 2009-10-01  Mark Rowe  <mrowe at apple.com>
 
         Fix the Tiger build.  Don't unconditionally enable 3D canvas as it is not supported on Tiger.
diff --git a/JavaScriptCore/JavaScriptCore.pri b/JavaScriptCore/JavaScriptCore.pri
index e55f295..95a03f1 100644
--- a/JavaScriptCore/JavaScriptCore.pri
+++ b/JavaScriptCore/JavaScriptCore.pri
@@ -36,6 +36,8 @@ GENERATED_SOURCES_DIR_SLASH = $${GENERATED_SOURCES_DIR}$${QMAKE_DIR_SEP}
 win32-* {
     LIBS += -lwinmm
 }
+contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
+contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
 
 # In debug mode JIT disabled until crash fixed
 win32-* {

-- 
WebKit Debian packaging