diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-09 05:31:43 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-09 05:31:43 (GMT) |
| commit | ae7a3485c0e6748361789491af33ee7b7fe093bc (patch) | |
| tree | 7d653db085947561419efbea4f9d66659eecae05 /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.gypi | |
| parent | bd54370a759db272ce06d2fcdcce3e90c1dd17e8 (diff) | |
| parent | dc4d2b260debda80b8a0d81c9a032050232fdaab (diff) | |
| download | Qt-ae7a3485c0e6748361789491af33ee7b7fe093bc.zip Qt-ae7a3485c0e6748361789491af33ee7b7fe093bc.tar.gz Qt-ae7a3485c0e6748361789491af33ee7b7fe093bc.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', |