summaryrefslogtreecommitdiffstats
path: root/src/core/web_contents_adapter_p.h
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2016-11-10 15:44:46 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2016-11-11 07:45:16 +0000
commit9c982f6b654c05eb653c8d571796f52332748127 (patch)
tree458858b9c99f61b34fc928bed6087a4575131223 /src/core/web_contents_adapter_p.h
parent6c941affb2dd263d929b69afae3a0b9664869a9d (diff)
Fix drops that originate outside the WebEngineView
Dragging things from another application onto QWebEngineView crashed. RenderViewHost::DragTargetDrop now requires a DropData object. Save the DropData object also in the case where we create it for a drag from outside. Change-Id: I8409500a4b27d06aeec02dce9856aca7e1415402 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
Diffstat (limited to 'src/core/web_contents_adapter_p.h')
-rw-r--r--src/core/web_contents_adapter_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/web_contents_adapter_p.h b/src/core/web_contents_adapter_p.h
index 77522d299..23a1aaef4 100644
--- a/src/core/web_contents_adapter_p.h
+++ b/src/core/web_contents_adapter_p.h
@@ -92,7 +92,7 @@ public:
WebContentsAdapterClient *adapterClient;
quint64 nextRequestId;
int lastFindRequestId;
- const content::DropData *currentDropData;
+ std::unique_ptr<content::DropData> currentDropData;
Qt::DropAction currentDropAction;
bool inDragUpdateLoop;
base::Closure dragUpdateLoopQuitClosure;