From 3874f8b632b548757671b67f4c141194e058daf4 Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Thu, 7 Aug 2014 17:38:11 +0200
Subject: [PATCH] Exclude accessibility files on windows
This allows the BrowserAccessibilityFactoryQt and
BrowserAccessibilityQt classes to also be used on Windows, and this
also remove our dependency on ATL, which is only easily available
for Visual Studio Professional users.
Change-Id: I1a9c047f0343252a0b6fcc215b84e4c2f3d664b4
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
src/core/qtwebengine_extras.gypi | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi
index ab8af819d..916dd4195 100644
--- a/src/core/qtwebengine_extras.gypi
+++ b/src/core/qtwebengine_extras.gypi
@@ -37,9 +37,11 @@
['exclude', 'browser/accessibility/browser_accessibility_cocoa\\.(cc|h)$'],
['exclude', 'browser/accessibility/browser_accessibility_gtk\\.(cc|h)$'],
['exclude', 'browser/accessibility/browser_accessibility_mac\\.(cc|h)$'],
+ ['exclude', 'browser/accessibility/browser_accessibility_win\\.(cc|h)$'],
['exclude', 'browser/accessibility/browser_accessibility_manager_android\\.(cc|h)$'],
['exclude', 'browser/accessibility/browser_accessibility_manager_gtk\\.(cc|h)$'],
['exclude', 'browser/accessibility/browser_accessibility_manager_mac\\.(cc|h)$'],
+ ['exclude', 'browser/accessibility/browser_accessibility_manager_win\\.(cc|h)$'],
['exclude', 'command_buffer/service/async_pixel_transfer_manager_egl\\.(cc|h)$'],
['exclude', 'common/gpu/image_transport_surface_android\\.cc$'],
['exclude', 'common/gpu/image_transport_surface_linux\\.cc$'],
@@ -48,6 +50,17 @@
['exclude', 'gl_surface_glx\\.cc$'],
['exclude', 'gl_surface_x11\\.cc$'],
['exclude', 'gl_surface_win\\.cc$'],
+ # Avoid the ATL dependency to allow building with VS Express
+ ['exclude', 'browser/accessibility/accessibility_tree_formatter\\.(cc|h)$',],
+ ['exclude', 'browser/accessibility/accessibility_tree_formatter_android\\.(cc|h)$',],
+ ['exclude', 'browser/accessibility/accessibility_tree_formatter_mac\\.(mm|h)$',],
+ ['exclude', 'browser/accessibility/accessibility_tree_formatter_utils_win\\.(cc|h)$',],
+ ['exclude', 'browser/accessibility/accessibility_tree_formatter_win\\.(cc|h)$',],
+ ['exclude', 'browser/accessibility/accessibility_ui\\.(cc|h)$',],
+ ['exclude', 'browser/renderer_host/legacy_render_widget_host_win\\.(cc|h)$'],
+ ['exclude', 'win/accessibility_ids_win\\.h$'],
+ ['exclude', 'win/accessibility_misc_utils\\.(cc|h)$'],
+ ['exclude', 'win/atl_module\\.h$'],
],
'defines': [
'TOOLKIT_QT',
--
GitLab