diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-08-31 10:20:42 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-07 10:49:06 +0200 |
| commit | 4444cae6e06c45e8f1f3d8702abde655f6175ba9 (patch) | |
| tree | f35cce1682c6500ecc8b6bb5ec6ad61d480310d8 /src/webengine/api/qquickwebengineview.cpp | |
| parent | 40d808b53ded6bc091d7f642450c5fb9b09d6131 (diff) | |
| parent | 7aa99d8d5b0dbf024019e70bf39b7d15796e1080 (diff) | |
| download | qtwebengine-4444cae6e06c45e8f1f3d8702abde655f6175ba9.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
.qmake.conf
src/core/compositor/display_gl_output_surface_qsg.cpp
src/core/web_engine_context.cpp
tests/auto/quick/quick.pro
Change-Id: Iaf03434696788c89f5d3b524969513a89cb0a235
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 8d810ee33..4bf957c3b 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -564,6 +564,7 @@ QQuickWebEngineViewPrivate::adoptNewWindow(QSharedPointer<WebContentsAdapter> ne const QRect &, const QUrl &targetUrl) { Q_Q(QQuickWebEngineView); + Q_ASSERT(newWebContents); QQuickWebEngineNewViewRequest request; request.m_adapter = newWebContents; request.m_isUserInitiated = userGesture; @@ -588,6 +589,9 @@ QQuickWebEngineViewPrivate::adoptNewWindow(QSharedPointer<WebContentsAdapter> ne Q_EMIT q->newViewRequested(&request); + if (!request.m_isRequestHandled) + return nullptr; + return newWebContents; } |