diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-11 13:45:28 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-11 13:45:28 +0200 |
| commit | d6a599dbc9d824a462b2b206316e102bf8136446 (patch) | |
| tree | ecb257a5e55b2239d74b90fdad62fccd661cf286 /Source/ThirdParty | |
| parent | 3ccc3a85f09a83557b391aae380d3bf5f81a2911 (diff) | |
| download | qtwebkit-d6a599dbc9d824a462b2b206316e102bf8136446.tar.gz | |
Imported WebKit commit 8ff1f22783a32de82fee915abd55bd1b298f2644 (http://svn.webkit.org/repository/webkit/trunk@122325)
New snapshot that should work with the latest Qt build system changes
Diffstat (limited to 'Source/ThirdParty')
| -rw-r--r-- | Source/ThirdParty/ChangeLog | 17 | ||||
| -rw-r--r-- | Source/ThirdParty/glu/.gitignore | 1 | ||||
| -rw-r--r-- | Source/ThirdParty/gtest/xcode/Config/General.xcconfig | 3 |
3 files changed, 19 insertions, 2 deletions
diff --git a/Source/ThirdParty/ChangeLog b/Source/ThirdParty/ChangeLog index d830ad966..9dff5fac4 100644 --- a/Source/ThirdParty/ChangeLog +++ b/Source/ThirdParty/ChangeLog @@ -1,3 +1,20 @@ +2012-07-03 Tony Chang <tony@chromium.org> + + [chromium] Unreviewed, update .gitignore to handle VS2010 files. + + * glu/.gitignore: + +2012-06-27 Ryosuke Niwa <rniwa@webkit.org> + + Fix gcc build after r121302 + https://bugs.webkit.org/show_bug.cgi?id=90055 + + Reviewed by Mark Rowe. + + Assume RTTI is disabled so that gtest builds under XCode 3.2.6. + + * gtest/xcode/Config/General.xcconfig: + 2012-04-30 Carlos Garcia Campos <cgarcia@igalia.com> Unreviewed. Fix make distcheck. diff --git a/Source/ThirdParty/glu/.gitignore b/Source/ThirdParty/glu/.gitignore index ce486c66b..2ee4f8c07 100644 --- a/Source/ThirdParty/glu/.gitignore +++ b/Source/ThirdParty/glu/.gitignore @@ -2,4 +2,5 @@ *.mk *.sln *.vcproj +*.vcxproj* glu.xcodeproj diff --git a/Source/ThirdParty/gtest/xcode/Config/General.xcconfig b/Source/ThirdParty/gtest/xcode/Config/General.xcconfig index 5a085ede9..1718ac9d7 100644 --- a/Source/ThirdParty/gtest/xcode/Config/General.xcconfig +++ b/Source/ThirdParty/gtest/xcode/Config/General.xcconfig @@ -36,7 +36,7 @@ ALWAYS_SEARCH_USER_PATHS = NO // Turn on position dependent code for most cases (overridden where appropriate) GCC_DYNAMIC_NO_PIC = YES -GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) GTEST_HAS_TR1_TUPLE=0; +GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) GTEST_HAS_TR1_TUPLE=0 GTEST_HAS_RTTI=0; CLANG_CXX_LIBRARY = $(CLANG_CXX_LIBRARY_$(TARGET_MAC_OS_X_VERSION_MAJOR)); CLANG_CXX_LIBRARY_1060 = libstdc++; @@ -71,6 +71,5 @@ SDKROOT_1080_1070 = macosx10.7; SDKROOT_1090_1070 = macosx10.7; SDKROOT_1090_1080 = macosx10.8; - // VERSIONING BUILD SETTINGS (used in Info.plist) GTEST_VERSIONINFO_ABOUT = © 2008 Google Inc. |