diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2018-02-07 09:51:29 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2018-02-07 11:38:51 +0000 |
| commit | ff1eb61ac5139f1760d35e884642c4b805b5e97c (patch) | |
| tree | f3590ec55115ca47545af9a038c26192037d19c8 /src/webengine/api/qquickwebengineview.cpp | |
| parent | e864d8656c2682fc79a5affe789992de318c8f8a (diff) | |
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 <alexandru.croitor@qt.io>
Diffstat (limited to 'src/webengine/api/qquickwebengineview.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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(); } |