From 315e656efa99fce4ec9e822d428eed8af4fd1022 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 6 Feb 2017 16:38:42 +0100 Subject: Improve cross-links between QtWebEngine classes in docs Change-Id: Iae853d4d3ab73306f90d93b62a419d1d440a3259 Reviewed-by: Leena Miettinen Reviewed-by: Kai Koehne --- src/webenginewidgets/api/qwebenginecertificateerror.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/webenginewidgets/api') diff --git a/src/webenginewidgets/api/qwebenginecertificateerror.cpp b/src/webenginewidgets/api/qwebenginecertificateerror.cpp index a0641c9dd..f04b73615 100644 --- a/src/webenginewidgets/api/qwebenginecertificateerror.cpp +++ b/src/webenginewidgets/api/qwebenginecertificateerror.cpp @@ -47,7 +47,8 @@ QT_BEGIN_NAMESPACE \since 5.4 \inmodule QtWebEngineWidgets - Provides information about a certificate error. + Provides information about a certificate error. This class is used as a parameter of + QWebEnginePage::certificateError(). */ class QWebEngineCertificateErrorPrivate { -- cgit v1.2.3 From c554f3348cd0baea8221e668d41132cea0833a8a Mon Sep 17 00:00:00 2001 From: Viktor Engelmann Date: Mon, 20 Mar 2017 11:52:38 +0100 Subject: Delegate QWebEngineHistory::currentItem() to itemAt() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Calling QWebEngineHistory::currentItem() before the first item is inserted, caused a segfault, due to accessing an illegal QList index. We now delegate the lookup to QWebEngineHistory::itemAt(), which checks the index first and returns a dummy element in case of an illegal index. Task-number: QTBUG-59599 Change-Id: I9cdd2533e33415a7b812c29fff5429eb005020dc Reviewed-by: Michael Brüning --- src/webenginewidgets/api/qwebenginehistory.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/webenginewidgets/api') diff --git a/src/webenginewidgets/api/qwebenginehistory.cpp b/src/webenginewidgets/api/qwebenginehistory.cpp index 41de8c90b..48ddbc48e 100644 --- a/src/webenginewidgets/api/qwebenginehistory.cpp +++ b/src/webenginewidgets/api/qwebenginehistory.cpp @@ -226,9 +226,7 @@ QWebEngineHistoryItem QWebEngineHistory::backItem() const QWebEngineHistoryItem QWebEngineHistory::currentItem() const { - Q_D(const QWebEngineHistory); - d->updateItems(); - return d->items[currentItemIndex()]; + return itemAt(currentItemIndex()); } QWebEngineHistoryItem QWebEngineHistory::forwardItem() const -- cgit v1.2.3