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/JavaScriptCore/generated/JSONObject.lut.h | |
| 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/JavaScriptCore/generated/JSONObject.lut.h')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/generated/JSONObject.lut.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/generated/JSONObject.lut.h b/src/3rdparty/webkit/JavaScriptCore/generated/JSONObject.lut.h index 2b7e836..a9b1631 100644 --- a/src/3rdparty/webkit/JavaScriptCore/generated/JSONObject.lut.h +++ b/src/3rdparty/webkit/JavaScriptCore/generated/JSONObject.lut.h @@ -10,6 +10,6 @@ static const struct HashTableValue jsonTableValues[3] = { { 0, 0, 0, 0 } }; -extern const struct HashTable jsonTable = +extern JSC_CONST_HASHTABLE HashTable jsonTable = { 4, 3, jsonTableValues, 0 }; } // namespace |