diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-09-09 01:58:52 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-09-09 01:58:52 (GMT) |
| commit | 87b8fe63d4832d7467719f462dea8fd459595480 (patch) | |
| tree | f1f66321f69ee4a72c3aa730215a20d84f475e2e /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.gypi | |
| parent | c253b86a77e8228479fec21c7237a54103ab95ee (diff) | |
| parent | d9fadadd4f78a5be9deca1da26be7d86f4da338c (diff) | |
| download | Qt-87b8fe63d4832d7467719f462dea8fd459595480.zip Qt-87b8fe63d4832d7467719f462dea8fd459595480.tar.gz Qt-87b8fe63d4832d7467719f462dea8fd459595480.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.gypi')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.gypi b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.gypi index 2d69c7d..5a75ab7 100644 --- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.gypi +++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.gypi @@ -323,7 +323,7 @@ 'runtime/TimeoutChecker.cpp', 'runtime/TimeoutChecker.h', 'runtime/Tracing.h', - 'runtime/TypeInfo.h', + 'runtime/JSTypeInfo.h', 'runtime/UString.cpp', 'runtime/UString.h', 'wrec/CharacterClass.cpp', |