diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-07-14 15:49:56 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-07-14 15:49:56 (GMT) |
| commit | 8fd9cbc859346d758bb730e85c679635f00940df (patch) | |
| tree | bc3b10d79a458933b1f481bd7e88d1a633e7bc1e /src/3rdparty/webkit/WebCore/generated/JSFile.cpp | |
| parent | 65b788014759fa06d65d1677b3dbd5cc4b596f6b (diff) | |
| parent | 06af27069497a693f5b1a867b29d96297f68eb75 (diff) | |
| download | Qt-8fd9cbc859346d758bb730e85c679635f00940df.zip Qt-8fd9cbc859346d758bb730e85c679635f00940df.tar.gz Qt-8fd9cbc859346d758bb730e85c679635f00940df.tar.bz2 | |
Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backend
Conflicts:
src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp
src/script/qscriptecmafunction.cpp
src/script/qscriptecmaglobal.cpp
src/script/qscriptengine.cpp
src/script/qscriptengine_p.cpp
src/script/qscriptenginefwd_p.h
src/script/qscriptextqobject.cpp
src/script/qscriptextqobject_p.h
tests/auto/qscriptqobject/tst_qscriptqobject.cpp
Diffstat (limited to 'src/3rdparty/webkit/WebCore/generated/JSFile.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/generated/JSFile.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/WebCore/generated/JSFile.cpp b/src/3rdparty/webkit/WebCore/generated/JSFile.cpp index d25dfc6..923e24b 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSFile.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSFile.cpp @@ -43,7 +43,7 @@ static const HashTableValue JSFileTableValues[4] = { 0, 0, 0, 0 } }; -static const HashTable JSFileTable = +static JSC_CONST_HASHTABLE HashTable JSFileTable = #if ENABLE(PERFECT_HASH_SIZE) { 7, JSFileTableValues, 0 }; #else @@ -57,7 +57,7 @@ static const HashTableValue JSFileConstructorTableValues[1] = { 0, 0, 0, 0 } }; -static const HashTable JSFileConstructorTable = +static JSC_CONST_HASHTABLE HashTable JSFileConstructorTable = #if ENABLE(PERFECT_HASH_SIZE) { 0, JSFileConstructorTableValues, 0 }; #else @@ -95,7 +95,7 @@ static const HashTableValue JSFilePrototypeTableValues[1] = { 0, 0, 0, 0 } }; -static const HashTable JSFilePrototypeTable = +static JSC_CONST_HASHTABLE HashTable JSFilePrototypeTable = #if ENABLE(PERFECT_HASH_SIZE) { 0, JSFilePrototypeTableValues, 0 }; #else |