diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-10-06 08:30:05 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-10-07 02:31:12 (GMT) |
| commit | 3e37395c10c15db20dff89afece0392aae4fd407 (patch) | |
| tree | dc26f1ea5defda4b9a94c1a40d9f0d1dbd0b8c02 /src | |
| parent | 4d976782c1cd5f1e526d212ad2a57f615a6e9b0c (diff) | |
| download | Qt-3e37395c10c15db20dff89afece0392aae4fd407.zip Qt-3e37395c10c15db20dff89afece0392aae4fd407.tar.gz Qt-3e37395c10c15db20dff89afece0392aae4fd407.tar.bz2 | |
Updated JavaScriptCore from /home/khansen/dev/qtwebkit to jsc-for-qtscript-4.6-staging-06102009 ( fc2005c87bbbb743eba96041210902fec821a1af )
(cherry picked from commit b7503346c1b7d245625b1b9e7cf7ae89a86467f0)
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp | 1 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/VERSION | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp index a509122..be817c3 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp @@ -46,7 +46,6 @@ #define DO_PROPERTYMAP_CONSTENCY_CHECK 0 #endif -using namespace std; using namespace WTF; namespace JSC { diff --git a/src/3rdparty/javascriptcore/VERSION b/src/3rdparty/javascriptcore/VERSION index 8f2b739..571d10f 100644 --- a/src/3rdparty/javascriptcore/VERSION +++ b/src/3rdparty/javascriptcore/VERSION @@ -4,8 +4,8 @@ This is a snapshot of JavaScriptCore from The commit imported was from the - jsc-for-qtscript-4.6-staging-05102009 branch/tag + jsc-for-qtscript-4.6-staging-06102009 branch/tag and has the sha1 checksum - ed678069ebd06579a26b4fb8cc944f06d6b0d55c + fc2005c87bbbb743eba96041210902fec821a1af |