summaryrefslogtreecommitdiff
path: root/Source/JavaScriptCore/JavaScriptCore.vcproj
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-08-21 10:57:44 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-08-21 10:57:44 +0200
commit5ef7c8a6a70875d4430752d146bdcb069605d71d (patch)
treef6256640b6c46d7da221435803cae65326817ba2 /Source/JavaScriptCore/JavaScriptCore.vcproj
parentdecad929f578d8db641febc8740649ca6c574638 (diff)
downloadqtwebkit-5ef7c8a6a70875d4430752d146bdcb069605d71d.tar.gz
Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 (http://svn.webkit.org/repository/webkit/trunk@126147)
New snapshot including various build fixes for newer Qt 5
Diffstat (limited to 'Source/JavaScriptCore/JavaScriptCore.vcproj')
-rw-r--r--Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj8
-rwxr-xr-xSource/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj7
2 files changed, 15 insertions, 0 deletions
diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
index 2efa84059..e91baa473 100644
--- a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
@@ -1530,6 +1530,14 @@
Name="bytecode"
>
<File
+ RelativePath="..\..\bytecode\ArrayProfile.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\bytecode\ArrayProfile.h"
+ >
+ </File>
+ <File
RelativePath="..\..\bytecode\CallLinkInfo.cpp"
>
</File>
diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj b/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj
index b7053908d..57b9ce643 100755
--- a/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj
@@ -50,6 +50,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/SAFESEH"
/>
<Tool
Name="VCALinkTool"
@@ -111,6 +112,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/SAFESEH"
/>
<Tool
Name="VCALinkTool"
@@ -172,6 +174,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/SAFESEH"
/>
<Tool
Name="VCALinkTool"
@@ -233,6 +236,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/SAFESEH"
/>
<Tool
Name="VCALinkTool"
@@ -295,6 +299,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/SAFESEH"
/>
<Tool
Name="VCALinkTool"
@@ -356,6 +361,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/SAFESEH"
/>
<Tool
Name="VCALinkTool"
@@ -417,6 +423,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/SAFESEH"
/>
<Tool
Name="VCALinkTool"