From 5ef7c8a6a70875d4430752d146bdcb069605d71d Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Tue, 21 Aug 2012 10:57:44 +0200
Subject: Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831
 (http://svn.webkit.org/repository/webkit/trunk@126147)

New snapshot including various build fixes for newer Qt 5
---
 .../JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj    | 8 ++++++++
 .../JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj            | 7 +++++++
 2 files changed, 15 insertions(+)

(limited to 'Source/JavaScriptCore/JavaScriptCore.vcproj')

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
@@ -1529,6 +1529,14 @@
 		<Filter
 			Name="bytecode"
 			>
+			<File
+				RelativePath="..\..\bytecode\ArrayProfile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\bytecode\ArrayProfile.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\bytecode\CallLinkInfo.cpp"
 				>
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"
-- 
cgit v1.2.3