diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-08 11:51:23 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-08 11:51:23 (GMT) |
| commit | c88f8d6337a2273f8dc5fb44830823c8d17354a3 (patch) | |
| tree | a27787bceabf8a75cc2cc5ecbaa998553bd5cc68 /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.gypi | |
| parent | beea786c9d1362b1fb12fdff209b842e21ef9cf8 (diff) | |
| parent | 0399ace27c7441b4454911da3aaa4ea17b931b99 (diff) | |
| download | Qt-c88f8d6337a2273f8dc5fb44830823c8d17354a3.zip Qt-c88f8d6337a2273f8dc5fb44830823c8d17354a3.tar.gz Qt-c88f8d6337a2273f8dc5fb44830823c8d17354a3.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', |