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/webengine/api/qquickwebengineview_p_p.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/webengine/api/qquickwebengineview_p_p.h')
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h index f97f2a8cf..964a4f0d9 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -174,7 +174,9 @@ public: virtual void authenticationRequired(const QUrl&, const QString&, bool, const QString&, QString*, QString*) Q_DECL_OVERRIDE { } virtual void runMediaAccessPermissionRequest(const QUrl &securityOrigin, MediaRequestFlags requestFlags) Q_DECL_OVERRIDE; virtual void runMouseLockPermissionRequest(const QUrl &securityOrigin) Q_DECL_OVERRIDE; +#ifndef QT_NO_ACCESSIBILITY virtual QObject *accessibilityParentObject() Q_DECL_OVERRIDE; +#endif // QT_NO_ACCESSIBILITY virtual WebEngineSettings *webEngineSettings() const Q_DECL_OVERRIDE; virtual void allowCertificateError(const QExplicitlySharedDataPointer<CertificateErrorController> &errorController); virtual void runGeolocationPermissionRequest(QUrl const&) Q_DECL_OVERRIDE; @@ -206,6 +208,7 @@ private: qreal m_dpiScale; }; +#ifndef QT_NO_ACCESSIBILITY class QQuickWebEngineViewAccessible : public QAccessibleObject { public: @@ -221,7 +224,7 @@ public: private: QQuickWebEngineView *engineView() const { return static_cast<QQuickWebEngineView*>(object()); } }; - +#endif // QT_NO_ACCESSIBILITY QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickWebEngineViewExperimental) |