summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.gypi
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-09-09 04:13:32 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-09-09 04:13:32 (GMT)
commit5ad67ddc40263cabd3fd99fb57c8f095403bcbbe (patch)
treea06b3640b8e3d6fe431acba0ba42a27ffbae0d87 /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.gypi
parent14e787b7e5abc1d665ba0e0229f60525283b1e38 (diff)
parenta57af1d6856ffa3a50eb1e0cdd1653b7b4ebdb41 (diff)
downloadQt-5ad67ddc40263cabd3fd99fb57c8f095403bcbbe.zip
Qt-5ad67ddc40263cabd3fd99fb57c8f095403bcbbe.tar.gz
Qt-5ad67ddc40263cabd3fd99fb57c8f095403bcbbe.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
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',