diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-03-16 14:34:43 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-03-16 14:34:43 +0100 |
commit | 9ffb601435df46744b1f4a95b3a4b231f4bda64e (patch) | |
tree | 48b34f7ef1ef8aea962cf103d97ec8ab7b38291b /src/webengine/api/qquickwebengineview_p_p.h | |
parent | 6e356d55c8eabcc96223e25182458b78378dd5a4 (diff) | |
parent | 9bec2760d44c944e7f6b43388924b5714d9e8e06 (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/webengine/ui_delegates_manager.h
Change-Id: I989280b6008fbc4844ed86d6d16f7e7aa6ba8db9
Diffstat (limited to 'src/webengine/api/qquickwebengineview_p_p.h')
-rw-r--r-- | src/webengine/api/qquickwebengineview_p_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h index b3907d3a4..d05055cbb 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -165,6 +165,9 @@ public: virtual QtWebEngineCore::WebEngineSettings *webEngineSettings() const Q_DECL_OVERRIDE; virtual void allowCertificateError(const QSharedPointer<CertificateErrorController> &errorController); 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; + virtual void moveValidationMessage(const QRect &anchor) Q_DECL_OVERRIDE; virtual QtWebEngineCore::BrowserContextAdapter *browserContextAdapter() Q_DECL_OVERRIDE; |