diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-09-09 07:53:46 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-09-09 07:53:46 (GMT) |
| commit | d71d5ffd356342e55f09b31f5a702926f86994eb (patch) | |
| tree | 9905e5ec166f9f26de4ad6633bf41b594a4b7de7 /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.gypi | |
| parent | 85881f83c34cbb92e5d2ea61d16daef1f34fcad8 (diff) | |
| parent | f7906352b21b0634745094f7bb7966d5f6941192 (diff) | |
| download | Qt-d71d5ffd356342e55f09b31f5a702926f86994eb.zip Qt-d71d5ffd356342e55f09b31f5a702926f86994eb.tar.gz Qt-d71d5ffd356342e55f09b31f5a702926f86994eb.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
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', |