diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-21 11:04:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 11:04:39 +0200 |
| commit | b04131f375a64204be962e7b92c88a3ecaf892c5 (patch) | |
| tree | ad3cac0a277791692eb4374af8b647cec5706cb1 /src/core/web_contents_delegate_qt.cpp | |
| parent | 001ee1d6da4bf6769d702810f8ebcb05978663cc (diff) | |
| parent | 0e5553a1626cb707499d82c96e136ceb79dfb54d (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/3rdparty
src/core/delegated_frame_node.h
src/webengine/api/qquickwebenginecontextmenudata.cpp
Change-Id: I163488d0d32cd981351608b2886f12e547e24672
Diffstat (limited to 'src/core/web_contents_delegate_qt.cpp')
| -rw-r--r-- | src/core/web_contents_delegate_qt.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp index 144cb0f19..9d0965818 100644 --- a/src/core/web_contents_delegate_qt.cpp +++ b/src/core/web_contents_delegate_qt.cpp @@ -104,6 +104,7 @@ content::WebContents *WebContentsDelegateQt::OpenURLFromTab(content::WebContents if (targetAdapter) target = targetAdapter->webContents(); } + Q_ASSERT(target); content::NavigationController::LoadURLParams load_url_params(params.url); load_url_params.referrer = params.referrer; |