diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-24 00:27:13 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-24 00:27:13 +0200 |
| commit | f8d91f930057154633d91cd513ce313d4c400090 (patch) | |
| tree | 73484b37ba47ea5ea3b834db0ebfd32d5fdb2e9e /src/webengine | |
| parent | 408b2b89a34b64939ce04e75d2b0bf47646b9b03 (diff) | |
| parent | 0340d87b7c12a5e56966e61db156e4a299b57bd9 (diff) | |
Merge remote-tracking branch 'origin/5.9.1' into 5.9
Conflicts:
mkspecs/features/functions.prf
Change-Id: I53d65ea49f546c7d4aadfdaff178fd2f3f4cdf11
Diffstat (limited to 'src/webengine')
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 2 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p_p.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 8021d0a1e..aae0efea8 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -710,13 +710,11 @@ void QQuickWebEngineViewPrivate::runMouseLockPermissionRequest(const QUrl &secur adapter->grantMouseLockPermission(false); } -#ifndef QT_NO_ACCESSIBILITY QObject *QQuickWebEngineViewPrivate::accessibilityParentObject() { Q_Q(QQuickWebEngineView); return q; } -#endif // QT_NO_ACCESSIBILITY QSharedPointer<BrowserContextAdapter> QQuickWebEngineViewPrivate::browserContextAdapter() { 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; |