diff options
| author | Stephan Binner <stephan.binner@basyskom.com> | 2015-03-04 12:39:29 +0100 |
|---|---|---|
| committer | Stephan Binner <stephan.binner@basyskom.com> | 2015-03-04 13:43:49 +0000 |
| commit | 9d1a77b5be56a6a1dade613573eaeea63070969f (patch) | |
| tree | 932425567b5f7240b4dcf811e90c89cb5ae6518d /src/core/render_widget_host_view_qt.cpp | |
| parent | 96f4439589d9385dd10f5e6dc1fa225b17d2eec5 (diff) | |
Enable building Qt WebEngine without accessiblity enabled.
This adds guards that for QT_NO_ACCESSIBILITY being not defined
around the code that uses accessibility types.
It disables the quicknanobrowser and quicktestbrowser examples
which need Qt QuickControls, which has a hard dependency to
accessibility being enabled.
Backport of d95b9295c970401939d2779cbdc9e2a8c7965277 from 5.5
Change-Id: I2a2a0a6196fcb3baa39603d9c929183b454f39ed
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'src/core/render_widget_host_view_qt.cpp')
| -rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index c221e94e3..18d64e84c 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -198,15 +198,18 @@ RenderWidgetHostViewQt::RenderWidgetHostViewQt(content::RenderWidgetHost* widget , m_initPending(false) { m_host->SetView(this); - +#ifndef QT_NO_ACCESSIBILITY QAccessible::installActivationObserver(this); if (QAccessible::isActive()) content::BrowserAccessibilityStateImpl::GetInstance()->EnableAccessibility(); +#endif // QT_NO_ACCESSIBILITY } RenderWidgetHostViewQt::~RenderWidgetHostViewQt() { +#ifndef QT_NO_ACCESSIBILITY QAccessible::removeActivationObserver(this); +#endif // QT_NO_ACCESSIBILITY } void RenderWidgetHostViewQt::setDelegate(RenderWidgetHostViewQtDelegate* delegate) @@ -296,6 +299,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewQt::GetNativeViewAccessible() void RenderWidgetHostViewQt::CreateBrowserAccessibilityManagerIfNeeded() { +#ifndef QT_NO_ACCESSIBILITY if (GetBrowserAccessibilityManager()) return; @@ -303,6 +307,9 @@ void RenderWidgetHostViewQt::CreateBrowserAccessibilityManagerIfNeeded() m_adapterClient->accessibilityParentObject(), content::BrowserAccessibilityManagerQt::GetEmptyDocument(), this)); +#else + return 0; +#endif // QT_NO_ACCESSIBILITY } // Set focus to the associated View component. @@ -953,6 +960,7 @@ void RenderWidgetHostViewQt::AccessibilityFatalError() SetBrowserAccessibilityManager(NULL); } +#ifndef QT_NO_ACCESSIBILITY void RenderWidgetHostViewQt::accessibilityActiveChanged(bool active) { if (active) @@ -960,6 +968,7 @@ void RenderWidgetHostViewQt::accessibilityActiveChanged(bool active) else content::BrowserAccessibilityStateImpl::GetInstance()->DisableAccessibility(); } +#endif // QT_NO_ACCESSIBILITY void RenderWidgetHostViewQt::handleWheelEvent(QWheelEvent *ev) { @@ -1042,6 +1051,7 @@ void RenderWidgetHostViewQt::handleFocusEvent(QFocusEvent *ev) } } +#ifndef QT_NO_ACCESSIBILITY QAccessibleInterface *RenderWidgetHostViewQt::GetQtAccessible() { // Assume we have a screen reader doing stuff @@ -1051,6 +1061,7 @@ QAccessibleInterface *RenderWidgetHostViewQt::GetQtAccessible() content::BrowserAccessibilityQt *accQt = static_cast<content::BrowserAccessibilityQt*>(acc); return accQt; } +#endif // QT_NO_ACCESSIBILITY void RenderWidgetHostViewQt::didFirstVisuallyNonEmptyLayout() { |