From ff1eb61ac5139f1760d35e884642c4b805b5e97c Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Wed, 7 Feb 2018 09:51:29 +0100 Subject: Fix crash on accessing WebEngineView properties too early WebContentsAdapter is not created together with the QQuickWebEngineView. Thus querying a view property can lead to a crash if it uses the adapter. This fix adds the missing guards for contentSize and scrollPosition as it is done for similar WebEngineView properties. Task-number: QTBUG-65942 Change-Id: I9c2668a059b08325629f5730608280ba7f3669cf Reviewed-by: Alexandru Croitor --- src/webengine/api/qquickwebengineview.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 25f578528..297790f34 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -1719,12 +1719,16 @@ void QQuickWebEngineView::triggerWebAction(WebAction action) QSizeF QQuickWebEngineView::contentsSize() const { Q_D(const QQuickWebEngineView); + if (!d->adapter) + return QSizeF(); return d->adapter->lastContentsSize(); } QPointF QQuickWebEngineView::scrollPosition() const { Q_D(const QQuickWebEngineView); + if (!d->adapter) + return QPointF(); return d->adapter->lastScrollOffset(); } -- cgit v1.2.3