diff options
| author | Michael Brüning <michael.bruning@theqtcompany.com> | 2015-01-20 16:20:42 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@theqtcompany.com> | 2015-01-23 11:52:08 +0100 |
| commit | d95b9295c970401939d2779cbdc9e2a8c7965277 (patch) | |
| tree | 16dacd587d16ebf84369783faeca45c5e8178ff8 /src/core/render_widget_host_view_qt.h | |
| parent | 82bef8eb423bc7a9f607fda95cd980a8b2816056 (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.
Task-number: QTBUG-43305
Change-Id: Ifa39e3ce447ebc2124f52e00b29b1d7d2231035e
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'src/core/render_widget_host_view_qt.h')
| -rw-r--r-- | src/core/render_widget_host_view_qt.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h index ee11888ad..93e7e75b4 100644 --- a/src/core/render_widget_host_view_qt.h +++ b/src/core/render_widget_host_view_qt.h @@ -52,6 +52,7 @@ #include <QRect> #include <QtGlobal> #include <QtGui/qaccessible.h> +#include <QtGui/QTouchEvent> #include "delegated_frame_node.h" @@ -61,7 +62,6 @@ class QFocusEvent; class QHoverEvent; class QKeyEvent; class QMouseEvent; -class QTouchEvent; class QVariant; class QWheelEvent; class QAccessibleInterface; @@ -94,7 +94,9 @@ class RenderWidgetHostViewQt , public ui::GestureProviderClient , public RenderWidgetHostViewQtDelegateClient , public base::SupportsWeakPtr<RenderWidgetHostViewQt> +#ifndef QT_NO_ACCESSIBILITY , public QAccessible::ActivationObserver +#endif // QT_NO_ACCESSIBILITY { public: RenderWidgetHostViewQt(content::RenderWidgetHost* widget); @@ -198,8 +200,9 @@ public: // Overridden from content::BrowserAccessibilityDelegate virtual content::BrowserAccessibilityManager* CreateBrowserAccessibilityManager(content::BrowserAccessibilityDelegate* delegate) Q_DECL_OVERRIDE; +#ifndef QT_NO_ACCESSIBILITY virtual void accessibilityActiveChanged(bool active) Q_DECL_OVERRIDE; - +#endif // QT_NO_ACCESSIBILITY void didFirstVisuallyNonEmptyLayout(); private: |