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/JSHTMLTableElement.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/JSHTMLTableElement.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/generated/JSHTMLTableElement.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableElement.cpp b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableElement.cpp index 96b92e0..6965555 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSHTMLTableElement.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSHTMLTableElement.cpp @@ -63,7 +63,7 @@ static const HashTableValue JSHTMLTableElementTableValues[16] = { 0, 0, 0, 0 } }; -static const HashTable JSHTMLTableElementTable = +static JSC_CONST_HASHTABLE HashTable JSHTMLTableElementTable = #if ENABLE(PERFECT_HASH_SIZE) { 127, JSHTMLTableElementTableValues, 0 }; #else @@ -77,7 +77,7 @@ static const HashTableValue JSHTMLTableElementConstructorTableValues[1] = { 0, 0, 0, 0 } }; -static const HashTable JSHTMLTableElementConstructorTable = +static JSC_CONST_HASHTABLE HashTable JSHTMLTableElementConstructorTable = #if ENABLE(PERFECT_HASH_SIZE) { 0, JSHTMLTableElementConstructorTableValues, 0 }; #else @@ -123,7 +123,7 @@ static const HashTableValue JSHTMLTableElementPrototypeTableValues[9] = { 0, 0, 0, 0 } }; -static const HashTable JSHTMLTableElementPrototypeTable = +static JSC_CONST_HASHTABLE HashTable JSHTMLTableElementPrototypeTable = #if ENABLE(PERFECT_HASH_SIZE) { 127, JSHTMLTableElementPrototypeTableValues, 0 }; #else |