diff options
| author | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-09 01:16:30 (GMT) |
|---|---|---|
| committer | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-09 01:16:30 (GMT) |
| commit | c5be02430eda5a555114ef332a389b7621904b17 (patch) | |
| tree | a428a79a5618a95de48f22bb4b40a8dbdb8816ae /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.gypi | |
| parent | 693695e5677422625d555943586d41fbd9dbe971 (diff) | |
| parent | 03050f1495a9071a7123ed70caff83466df8c6e5 (diff) | |
| download | Qt-c5be02430eda5a555114ef332a389b7621904b17.zip Qt-c5be02430eda5a555114ef332a389b7621904b17.tar.gz Qt-c5be02430eda5a555114ef332a389b7621904b17.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.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', |