diff options
| author | Paulo Pinheiro <paulovap.os@gmail.com> | 2014-10-10 12:18:05 -0300 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@theqtcompany.com> | 2015-02-02 11:00:23 +0000 |
| commit | 6d896290a020babe5fbaf6c444485df8b1d5d353 (patch) | |
| tree | 87aa1de0b21668446f762bd83897b71f2e902cbd /src/webenginewidgets | |
| parent | fcc9a1d4283079cfa4f36c48b832461d59e8a627 (diff) | |
Add Qt WebEngine Quick API for allowing certificate errors
This adds API for overriding some certificate errors. Once overridden
any identical error for the same hostname and certificate will use
the same override.
Change-Id: Idf9e968edca18751cbdab744880480750d0c1bd4
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'src/webenginewidgets')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 2 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 5f1c06d0b..32c467c08 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -711,7 +711,7 @@ void QWebEnginePagePrivate::javascriptDialog(QSharedPointer<JavaScriptDialogCont controller->reject(); } -void QWebEnginePagePrivate::allowCertificateError(const QExplicitlySharedDataPointer<CertificateErrorController> &controller) +void QWebEnginePagePrivate::allowCertificateError(const QSharedPointer<CertificateErrorController> &controller) { Q_Q(QWebEnginePage); bool accepted = false; diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h index 1f44b6124..93b94bfa5 100644 --- a/src/webenginewidgets/api/qwebenginepage_p.h +++ b/src/webenginewidgets/api/qwebenginepage_p.h @@ -142,7 +142,7 @@ public: virtual QObject *accessibilityParentObject() Q_DECL_OVERRIDE; #endif // QT_NO_ACCESSIBILITY virtual WebEngineSettings *webEngineSettings() const Q_DECL_OVERRIDE; - virtual void allowCertificateError(const QExplicitlySharedDataPointer<CertificateErrorController> &controller) Q_DECL_OVERRIDE; + virtual void allowCertificateError(const QSharedPointer<CertificateErrorController> &controller) Q_DECL_OVERRIDE; virtual BrowserContextAdapter *browserContextAdapter() Q_DECL_OVERRIDE; |