summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.gypi
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-09-09 05:01:12 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-09-09 05:01:12 (GMT)
commit8e3e60b9ea7e4bccbc6d1a7fa90778e847e64190 (patch)
treee0243494d098a4a8f39f140d4d3e7b9370a765c5 /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.gypi
parenta88e4867b35c73af6e5b410e926b6df9dc2e19a5 (diff)
parent62d1b1db21d2660bd5f2322cb9f09cf2598bf90b (diff)
downloadQt-8e3e60b9ea7e4bccbc6d1a7fa90778e847e64190.zip
Qt-8e3e60b9ea7e4bccbc6d1a7fa90778e847e64190.tar.gz
Qt-8e3e60b9ea7e4bccbc6d1a7fa90778e847e64190.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.gypi2
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',