From 79ad030d505ccf79cf10aa9f8189ca3e2f61f6f4 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 25 Jun 2012 13:35:59 +0200 Subject: Imported WebKit commit c4b613825abd39ac739a47d7b4410468fcef66dc (http://svn.webkit.org/repository/webkit/trunk@121147) New snapshot that includes Win32 debug build fix (use SVGAllInOne) --- Source/WebKit/chromium/WebKit.gyp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Source/WebKit/chromium/WebKit.gyp') diff --git a/Source/WebKit/chromium/WebKit.gyp b/Source/WebKit/chromium/WebKit.gyp index 74db258be..bcbb91386 100644 --- a/Source/WebKit/chromium/WebKit.gyp +++ b/Source/WebKit/chromium/WebKit.gyp @@ -561,6 +561,7 @@ 'src/WebIDBKey.cpp', 'src/WebIDBKeyPath.cpp', 'src/WebIDBKeyRange.cpp', + 'src/WebIDBMetadata.cpp', 'src/WebIDBObjectStoreImpl.cpp', 'src/WebIDBObjectStoreImpl.h', 'src/WebIDBTransactionImpl.cpp', @@ -1036,7 +1037,7 @@ }, ], # targets 'conditions': [ - ['os_posix==1 and OS!="mac" and OS!="android" and gcc_version==46', { + ['os_posix==1 and OS!="mac" and gcc_version==46', { 'target_defaults': { # Disable warnings about c++0x compatibility, as some names (such # as nullptr) conflict with upcoming c++0x types. -- cgit v1.2.1