diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
| commit | dd91e772430dc294e3bf478c119ef8d43c0a3358 (patch) | |
| tree | 6f33ce4d5872a5691e0291eb45bf6ab373a5f567 /Source/ThirdParty | |
| parent | ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (diff) | |
| download | qtwebkit-dd91e772430dc294e3bf478c119ef8d43c0a3358.tar.gz | |
Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422)
This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.
Diffstat (limited to 'Source/ThirdParty')
| -rw-r--r-- | Source/ThirdParty/ANGLE/ChangeLog | 9 | ||||
| -rw-r--r-- | Source/ThirdParty/ChangeLog | 26 | ||||
| -rw-r--r-- | Source/ThirdParty/gtest/msvc/gtest-md.vcproj | 12 | ||||
| -rw-r--r-- | Source/ThirdParty/gtest/xcode/Config/General.xcconfig | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | Source/ThirdParty/gtest/xcode/Samples/FrameworkSample/runtests.sh | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | Source/ThirdParty/gtest/xcode/Scripts/runtests.sh | 0 |
6 files changed, 42 insertions, 7 deletions
diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog index db1a8388b..c8948179f 100644 --- a/Source/ThirdParty/ANGLE/ChangeLog +++ b/Source/ThirdParty/ANGLE/ChangeLog @@ -1,3 +1,12 @@ +2012-03-09 Ashod Nakashian <ashodnakashian@yahoo.com> + + Bash scripts should support LF endings only + https://bugs.webkit.org/show_bug.cgi?id=79509 + + Reviewed by David Kilzer. + + * src/compiler/generate_parser.sh: Added property svn:eol-style. + 2012-02-21 Sam Weinig <sam@webkit.org> Attempt to fix the Snow Leopard build. diff --git a/Source/ThirdParty/ChangeLog b/Source/ThirdParty/ChangeLog index 3e2010833..e19eb3704 100644 --- a/Source/ThirdParty/ChangeLog +++ b/Source/ThirdParty/ChangeLog @@ -1,3 +1,29 @@ +2012-03-09 Ashod Nakashian <ashodnakashian@yahoo.com> + + Bash scripts should support LF endings only + https://bugs.webkit.org/show_bug.cgi?id=79509 + + Reviewed by David Kilzer. + + * gtest/xcode/Samples/FrameworkSample/runtests.sh: Added property svn:executable. + * gtest/xcode/Scripts/runtests.sh: Added property svn:executable. + +2012-03-08 Jessie Berlin <jberlin@apple.com> + + More Windows build fixing. + + * gtest/msvc/gtest-md.vcproj: + +2012-03-07 Jessie Berlin <jberlin@apple.com> + + Clean Windows build fails after r110033 + https://bugs.webkit.org/show_bug.cgi?id=80553 + + Rubber-stamped by Jon Honeycutt and Eric Seidel. + + * gtest/msvc/gtest-md.vcproj: + Add the new JavaScriptCore include directory to the include path. + 2012-02-21 Sam Weinig <sam@webkit.org> Attempt to fix the Snow Leopard build. diff --git a/Source/ThirdParty/gtest/msvc/gtest-md.vcproj b/Source/ThirdParty/gtest/msvc/gtest-md.vcproj index 6c987e9c3..0d09469e5 100644 --- a/Source/ThirdParty/gtest/msvc/gtest-md.vcproj +++ b/Source/ThirdParty/gtest/msvc/gtest-md.vcproj @@ -40,8 +40,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private"" Optimization="0" + AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private";"$(ConfigurationBuildDir)\include\private\JavaScriptCore"" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -104,7 +104,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private"" + AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private";"$(ConfigurationBuildDir)\include\private\JavaScriptCore"" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -166,8 +166,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private"" Optimization="0" + AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private";"$(ConfigurationBuildDir)\include\private\JavaScriptCore"" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -231,7 +231,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private"" + AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private";"$(ConfigurationBuildDir)\include\private\JavaScriptCore"" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -293,7 +293,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private"" + AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private";"$(ConfigurationBuildDir)\include\private\JavaScriptCore"" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -355,8 +355,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private"" Optimization="0" + AdditionalIncludeDirectories=""$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\include\private";"$(ConfigurationBuildDir)\include\private\JavaScriptCore"" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" diff --git a/Source/ThirdParty/gtest/xcode/Config/General.xcconfig b/Source/ThirdParty/gtest/xcode/Config/General.xcconfig index 93307b687..5a085ede9 100644 --- a/Source/ThirdParty/gtest/xcode/Config/General.xcconfig +++ b/Source/ThirdParty/gtest/xcode/Config/General.xcconfig @@ -12,7 +12,7 @@ // Not building PowerPC any more ARCHS = i386 x86_64 -HEADER_SEARCH_PATHS = $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders ../ ../include/ +HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders ../ ../include/ // Zerolink prevents link warnings so turn it off ZERO_LINK = NO diff --git a/Source/ThirdParty/gtest/xcode/Samples/FrameworkSample/runtests.sh b/Source/ThirdParty/gtest/xcode/Samples/FrameworkSample/runtests.sh index 4a0d413e5..4a0d413e5 100644..100755 --- a/Source/ThirdParty/gtest/xcode/Samples/FrameworkSample/runtests.sh +++ b/Source/ThirdParty/gtest/xcode/Samples/FrameworkSample/runtests.sh diff --git a/Source/ThirdParty/gtest/xcode/Scripts/runtests.sh b/Source/ThirdParty/gtest/xcode/Scripts/runtests.sh index 3fc229f1d..3fc229f1d 100644..100755 --- a/Source/ThirdParty/gtest/xcode/Scripts/runtests.sh +++ b/Source/ThirdParty/gtest/xcode/Scripts/runtests.sh |