diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-06-19 16:04:54 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-06-23 06:29:31 +0000 |
| commit | 0a6707ac82b9a8bd3a810035ecd8db2269352b59 (patch) | |
| tree | d0dc60e643d83e53adfef35acb41f38cd15ab1a1 /src/webengine/api/qquickwebengineview_p_p.h | |
| parent | d5de0e97e6318bf17a3dac027c299b7f202f2e58 (diff) | |
Fix crash when accessibility is disabled
With the no-accessibility feature moved to qtgui-config, we don't
always include it where web_content_apapter_client.h is included, which
gives it an inconsistent binary layout.
Solve it by making the optional method always defined as it doesn't
rely on anything from accessibility.
Task-number: QTBUG-61200
Change-Id: I65f34ab2b6763f3166b945e700994bd8d019a835
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/webengine/api/qquickwebengineview_p_p.h')
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h index 64c63f31a..19ecf5e1f 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -129,9 +129,7 @@ public: virtual void authenticationRequired(QSharedPointer<QtWebEngineCore::AuthenticationDialogController>) 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 QtWebEngineCore::WebEngineSettings *webEngineSettings() const Q_DECL_OVERRIDE; virtual void allowCertificateError(const QSharedPointer<CertificateErrorController> &errorController) Q_DECL_OVERRIDE; virtual void runGeolocationPermissionRequest(QUrl const&) Q_DECL_OVERRIDE; |