Imported WebKit commit 37c5e5041d39a14ea0d429a77ebd352e4bd26516 (http://svn.webkit.org/repository/webkit/trunk@128608)

New snapshot that enables WebKit2 build on Windows (still some bugs) and allows for WebKit to be built with qmake && make

1 files changed, 32 insertions, 32 deletions

diff --git a/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp b/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp
index 31d30e53e..28e82ac07 100644
--- a/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp
+++ b/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp
@@ -50,38 +50,38 @@
         '../../../Source/WebKit/chromium/features.gypi',
     ],
     'targets': [
-        { 
-            'target_name': 'TestWebKitAPI', 
-            'type': 'executable', 
-            'dependencies': [ 
-                '<(source_dir)/WebKit/chromium/WebKit.gyp:webkit', 
-                '<(source_dir)/WTF/WTF.gyp/WTF.gyp:wtf', 
+        {
+            'target_name': 'TestWebKitAPI',
+            'type': 'executable',
+            'dependencies': [
+                '<(source_dir)/WebKit/chromium/WebKit.gyp:webkit',
+                '<(source_dir)/WTF/WTF.gyp/WTF.gyp:wtf',
                 '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
                 '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
-                '<(chromium_src_dir)/base/base.gyp:test_support_base', 
-                '<(chromium_src_dir)/testing/gtest.gyp:gtest', 
-                '<(chromium_src_dir)/testing/gmock.gyp:gmock', 
-                '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support', 
-            ], 
-            'include_dirs': [ 
-                '<(tools_dir)/TestWebKitAPI', 
-                # Needed by tests/RunAllTests.cpp, as well as ChromiumCurrentTime.cpp and 
-                # ChromiumThreading.cpp in chromium shared library configuration. 
-                '<(source_dir)/WebKit/chromium/public', 
-            ], 
-            'sources': [ 
-                # Reuse the same testing driver of Chromium's webkit_unit_tests. 
-                '<(source_dir)/WebKit/chromium/tests/RunAllTests.cpp', 
-                '<@(TestWebKitAPI_files)', 
-            ], 
-            'conditions': [ 
-                ['inside_chromium_build==1 and component=="shared_library"', { 
-                    'sources': [ 
-                        # To satisfy linking of WTF::currentTime() etc. in shared library configuration, 
-                        # as the symbols are not exported from the DLLs. 
-                        '<(source_dir)/WebKit/chromium/src/ChromiumCurrentTime.cpp', 
-                        '<(source_dir)/WebKit/chromium/src/ChromiumThreading.cpp', 
-                    ], 
+                '<(chromium_src_dir)/base/base.gyp:test_support_base',
+                '<(chromium_src_dir)/testing/gtest.gyp:gtest',
+                '<(chromium_src_dir)/testing/gmock.gyp:gmock',
+                '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
+            ],
+            'include_dirs': [
+                '<(tools_dir)/TestWebKitAPI',
+                # Needed by tests/RunAllTests.cpp, as well as ChromiumCurrentTime.cpp and
+                # ChromiumThreading.cpp in chromium shared library configuration.
+                '<(source_dir)/WebKit/chromium/public',
+            ],
+            'sources': [
+                # Reuse the same testing driver of Chromium's webkit_unit_tests.
+                '<(source_dir)/WebKit/chromium/tests/RunAllTests.cpp',
+                '<@(TestWebKitAPI_files)',
+            ],
+            'conditions': [
+                ['inside_chromium_build==1 and component=="shared_library"', {
+                    'sources': [
+                        # To satisfy linking of WTF::currentTime() etc. in shared library configuration,
+                        # as the symbols are not exported from the DLLs.
+                        '<(source_dir)/WebKit/chromium/src/ChromiumCurrentTime.cpp',
+                        '<(source_dir)/WebKit/chromium/src/ChromiumThreading.cpp',
+                    ],
                 }],
                 ['OS=="android" and gtest_target_type == "shared_library"', {
                     'type': 'shared_library',
@@ -90,7 +90,7 @@
                     ],
                 }],
             ],
-        }, 
+        },
     ], # targets
     'conditions': [
         ['OS=="android" and gtest_target_type == "shared_library"', {
@@ -99,7 +99,7 @@
                 'target_name': 'TestWebKitAPI_apk',
                 'type': 'none',
                 'dependencies': [
-                    '<(chromium_src_dir)/base/base.gyp:base_java',
+                    '<(chromium_src_dir)/base/base.gyp:base',
                     'TestWebKitAPI',
                 ],
                 'variables': {