diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-20 13:38:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-20 18:27:44 +0200 |
| commit | 25ccef35eb19fd656eba2a7abe5419972ed28552 (patch) | |
| tree | e0c92532c3c70135d0a547675414e95d21a66822 /src/webengine/api/qquickwebengineview_p_p.h | |
| parent | 3398abfc1b5b789d11592aada0b5860e36a50041 (diff) | |
| parent | e91f09947b55dda8a13b2aeb0963836dee2ece8d (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/3rdparty
src/core/permission_manager_qt.cpp
src/core/renderer/web_channel_ipc_transport.cpp
src/core/renderer/web_channel_ipc_transport.h
Change-Id: I25fd8ed7c433dadce44d8ac1e39f86e211ec25f0
Diffstat (limited to 'src/webengine/api/qquickwebengineview_p_p.h')
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h index 909763614..1b5198110 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -175,7 +175,7 @@ public: 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); + virtual void allowCertificateError(const QSharedPointer<CertificateErrorController> &errorController) Q_DECL_OVERRIDE; virtual void runGeolocationPermissionRequest(QUrl const&) Q_DECL_OVERRIDE; virtual void showValidationMessage(const QRect &anchor, const QString &mainText, const QString &subText) Q_DECL_OVERRIDE; virtual void hideValidationMessage() Q_DECL_OVERRIDE; @@ -188,6 +188,7 @@ public: void startDragging(const content::DropData &dropData, Qt::DropActions allowedActions, const QPixmap &pixmap, const QPoint &offset) Q_DECL_OVERRIDE; virtual bool isEnabled() const Q_DECL_OVERRIDE; + const QObject *holdingQObject() const Q_DECL_OVERRIDE; virtual QSharedPointer<QtWebEngineCore::BrowserContextAdapter> browserContextAdapter() Q_DECL_OVERRIDE; QtWebEngineCore::WebContentsAdapter *webContentsAdapter() Q_DECL_OVERRIDE; |