diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-09-09 03:26:43 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-09-09 03:26:43 (GMT) |
| commit | a57af1d6856ffa3a50eb1e0cdd1653b7b4ebdb41 (patch) | |
| tree | 89ba7921060e24822e80a379f7dd1e99ef8f4ce4 /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.gypi | |
| parent | a8db74459f4d155990e140bdf32e01985d6383a9 (diff) | |
| parent | 87b8fe63d4832d7467719f462dea8fd459595480 (diff) | |
| download | Qt-a57af1d6856ffa3a50eb1e0cdd1653b7b4ebdb41.zip Qt-a57af1d6856ffa3a50eb1e0cdd1653b7b4ebdb41.tar.gz Qt-a57af1d6856ffa3a50eb1e0cdd1653b7b4ebdb41.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/fx/qfxlistview.h
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', |