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/JSPlugin.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/JSPlugin.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/generated/JSPlugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/WebCore/generated/JSPlugin.cpp b/src/3rdparty/webkit/WebCore/generated/JSPlugin.cpp index 9b3c480..c8d0432 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSPlugin.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSPlugin.cpp @@ -50,7 +50,7 @@ static const HashTableValue JSPluginTableValues[6] = { 0, 0, 0, 0 } }; -static const HashTable JSPluginTable = +static JSC_CONST_HASHTABLE HashTable JSPluginTable = #if ENABLE(PERFECT_HASH_SIZE) { 127, JSPluginTableValues, 0 }; #else @@ -64,7 +64,7 @@ static const HashTableValue JSPluginConstructorTableValues[1] = { 0, 0, 0, 0 } }; -static const HashTable JSPluginConstructorTable = +static JSC_CONST_HASHTABLE HashTable JSPluginConstructorTable = #if ENABLE(PERFECT_HASH_SIZE) { 0, JSPluginConstructorTableValues, 0 }; #else @@ -104,7 +104,7 @@ static const HashTableValue JSPluginPrototypeTableValues[3] = { 0, 0, 0, 0 } }; -static const HashTable JSPluginPrototypeTable = +static JSC_CONST_HASHTABLE HashTable JSPluginPrototypeTable = #if ENABLE(PERFECT_HASH_SIZE) { 7, JSPluginPrototypeTableValues, 0 }; #else |