diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2017-03-24 11:38:51 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2017-03-24 11:38:51 +0100 |
| commit | f9d1e2da039398de76f8d62d2f6b43339b9e3b4b (patch) | |
| tree | 7b572ca5c947cd58db0e1144aba36dc8a5892773 /src/webenginewidgets/api | |
| parent | 7f00e90d3c4be2b023166e483c29a280960a35a4 (diff) | |
| parent | c554f3348cd0baea8221e668d41132cea0833a8a (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I8a281e308ec1a6e93dc9756ba6399ca1b50210d8
Diffstat (limited to 'src/webenginewidgets/api')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginecertificateerror.cpp | 3 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebenginehistory.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
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 { 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 |