diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
| commit | 5ef7c8a6a70875d4430752d146bdcb069605d71d (patch) | |
| tree | f6256640b6c46d7da221435803cae65326817ba2 /Source/ThirdParty | |
| parent | decad929f578d8db641febc8740649ca6c574638 (diff) | |
| download | qtwebkit-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/ThirdParty')
6 files changed, 16 insertions, 0 deletions
diff --git a/Source/ThirdParty/ANGLE/src/libEGL/libEGL.vcproj b/Source/ThirdParty/ANGLE/src/libEGL/libEGL.vcproj index c3e8a4b9e..d02d292fe 100644 --- a/Source/ThirdParty/ANGLE/src/libEGL/libEGL.vcproj +++ b/Source/ThirdParty/ANGLE/src/libEGL/libEGL.vcproj @@ -67,6 +67,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalOptions="/SAFESEH" AdditionalDependencies="d3d9.lib dxguid.lib dwmapi.lib" LinkIncremental="2" ModuleDefinitionFile="libEGL.def" @@ -148,6 +149,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalOptions="/SAFESEH" AdditionalDependencies="d3d9.lib dxguid.lib dwmapi.lib" LinkIncremental="1" ModuleDefinitionFile="libEGL.def" @@ -232,6 +234,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalOptions="/SAFESEH" AdditionalDependencies="d3d9.lib dxguid.lib dwmapi.lib" LinkIncremental="2" ModuleDefinitionFile="libEGL.def" @@ -314,6 +317,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalOptions="/SAFESEH" AdditionalDependencies="d3d9.lib dxguid.lib dwmapi.lib" LinkIncremental="1" ModuleDefinitionFile="libEGL.def" diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.vcproj b/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.vcproj index 3bc836399..d97d4e92c 100644 --- a/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.vcproj +++ b/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.vcproj @@ -67,6 +67,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalOptions="/SAFESEH" AdditionalDependencies="d3d9.lib D3dx9.lib d3dcompiler.lib" LinkIncremental="2" ModuleDefinitionFile="libGLESv2.def" @@ -147,6 +148,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalOptions="/SAFESEH" AdditionalDependencies="d3d9.lib D3dx9.lib d3dcompiler.lib" LinkIncremental="1" IgnoreAllDefaultLibraries="false" @@ -231,6 +233,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalOptions="/SAFESEH" AdditionalDependencies="d3d9.lib D3dx9.lib d3dcompiler.lib" LinkIncremental="2" ModuleDefinitionFile="libGLESv2.def" @@ -312,6 +315,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalOptions="/SAFESEH" AdditionalDependencies="d3d9.lib D3dx9.lib d3dcompiler.lib" LinkIncremental="1" IgnoreAllDefaultLibraries="false" diff --git a/Source/ThirdParty/gtest/msvc/gtest_prod_test-md.vcproj b/Source/ThirdParty/gtest/msvc/gtest_prod_test-md.vcproj index 4071d28fe..255b49428 100644 --- a/Source/ThirdParty/gtest/msvc/gtest_prod_test-md.vcproj +++ b/Source/ThirdParty/gtest/msvc/gtest_prod_test-md.vcproj @@ -31,6 +31,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" + AdditionalOptions="/SAFESEH" OutputFile="$(OutDir)/gtest_prod_test.exe" LinkIncremental="2" GenerateDebugInformation="TRUE" @@ -76,6 +77,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" + AdditionalOptions="/SAFESEH" OutputFile="$(OutDir)/gtest_prod_test.exe" LinkIncremental="1" GenerateDebugInformation="TRUE" diff --git a/Source/ThirdParty/gtest/msvc/gtest_prod_test.vcproj b/Source/ThirdParty/gtest/msvc/gtest_prod_test.vcproj index 998c75808..8fe6f24d3 100644 --- a/Source/ThirdParty/gtest/msvc/gtest_prod_test.vcproj +++ b/Source/ThirdParty/gtest/msvc/gtest_prod_test.vcproj @@ -31,6 +31,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" + AdditionalOptions="/SAFESEH" OutputFile="$(OutDir)/gtest_prod_test.exe" LinkIncremental="2" GenerateDebugInformation="TRUE" @@ -76,6 +77,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" + AdditionalOptions="/SAFESEH" OutputFile="$(OutDir)/gtest_prod_test.exe" LinkIncremental="1" GenerateDebugInformation="TRUE" diff --git a/Source/ThirdParty/gtest/msvc/gtest_unittest-md.vcproj b/Source/ThirdParty/gtest/msvc/gtest_unittest-md.vcproj index 152593975..aeaefd035 100644 --- a/Source/ThirdParty/gtest/msvc/gtest_unittest-md.vcproj +++ b/Source/ThirdParty/gtest/msvc/gtest_unittest-md.vcproj @@ -31,6 +31,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" + AdditionalOptions="/SAFESEH" OutputFile="$(OutDir)/gtest_unittest.exe" LinkIncremental="2" GenerateDebugInformation="TRUE" @@ -76,6 +77,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" + AdditionalOptions="/SAFESEH" OutputFile="$(OutDir)/gtest_unittest.exe" LinkIncremental="1" GenerateDebugInformation="TRUE" diff --git a/Source/ThirdParty/gtest/msvc/gtest_unittest.vcproj b/Source/ThirdParty/gtest/msvc/gtest_unittest.vcproj index 2b2d74345..560346907 100644 --- a/Source/ThirdParty/gtest/msvc/gtest_unittest.vcproj +++ b/Source/ThirdParty/gtest/msvc/gtest_unittest.vcproj @@ -31,6 +31,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" + AdditionalOptions="/SAFESEH" OutputFile="$(OutDir)/gtest_unittest.exe" LinkIncremental="2" GenerateDebugInformation="TRUE" @@ -76,6 +77,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" + AdditionalOptions="/SAFESEH" OutputFile="$(OutDir)/gtest_unittest.exe" LinkIncremental="1" GenerateDebugInformation="TRUE" |