diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-18 21:09:26 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-18 21:10:15 +0100 |
| commit | 6f0bf6bca2990ab45f4b673e4a3b720756a794b1 (patch) | |
| tree | 291feccb15233021a1e32e7fa812f34b3868ebff | |
| parent | 51658fac63299f818afd8ddde6dccee66a36efda (diff) | |
| parent | 2e06a051404c250b847421364c098bf541c43773 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
.qmake.conf
Change-Id: I230e21638604fe75b6f1d6b7877f9bc4b2d2c020
| -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 91ae20481..85681bfef 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -1726,12 +1726,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(); } |