summaryrefslogtreecommitdiffstats
path: root/src/core/web_contents_delegate_qt.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-02-01 13:48:44 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-02-02 14:30:46 +0100
commit092842b5e00662ae9888a19326a9fe4cf140f4da (patch)
tree1ebf6cf6adacf07425ea92f3d62588e01269975b /src/core/web_contents_delegate_qt.cpp
parentc8bb939e7e45214f17daf8f576582e5bff2527ea (diff)
parent7644564d754bbee640a091950b77e23586c2d283 (diff)
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts: src/core/download_manager_delegate_qt.cpp src/core/download_manager_delegate_qt.h src/core/render_widget_host_view_qt.cpp src/core/web_contents_adapter.cpp src/webengine/api/qquickwebengineview.cpp tests/auto/widgets/qwebenginedownloads/tst_qwebenginedownloads.cpp Change-Id: I2308414ce257ae5bb0fc9f6493aa111a267ff39b
Diffstat (limited to 'src/core/web_contents_delegate_qt.cpp')
-rw-r--r--src/core/web_contents_delegate_qt.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
index 5364afa94..09cca943e 100644
--- a/src/core/web_contents_delegate_qt.cpp
+++ b/src/core/web_contents_delegate_qt.cpp
@@ -110,6 +110,13 @@ WebContentsDelegateQt::WebContentsDelegateQt(content::WebContents *webContents,
Observe(webContents);
}
+WebContentsDelegateQt::~WebContentsDelegateQt()
+{
+ // The destruction of this object should take place before
+ // WebContents destruction since WebContentsAdapterClient
+ // might be already deleted.
+}
+
content::WebContents *WebContentsDelegateQt::OpenURLFromTab(content::WebContents *source, const content::OpenURLParams &params)
{
content::WebContents *target = source;