diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-25 11:47:47 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-25 12:40:00 +0200 |
| commit | 658a964cf2593e6da3b1a822124e796bbe354d36 (patch) | |
| tree | 8c35a964023069a974f1c54cd679490593e485f2 /src/core/web_contents_adapter_client.h | |
| parent | 63cf26268996ae5580c77095a252696fa549b593 (diff) | |
| parent | a3318c84b022282a5a4a2babc51d1e3ca634e25b (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I329397621f19ba3890be5daf44a6bb2d668ad2d8
Diffstat (limited to 'src/core/web_contents_adapter_client.h')
| -rw-r--r-- | src/core/web_contents_adapter_client.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h index f99cedcad..80aabaa4d 100644 --- a/src/core/web_contents_adapter_client.h +++ b/src/core/web_contents_adapter_client.h @@ -258,8 +258,9 @@ public: virtual void startDragging(const content::DropData &dropData, Qt::DropActions allowedActions, const QPixmap &pixmap, const QPoint &offset) = 0; - virtual BrowserContextAdapter* browserContextAdapter() = 0; + virtual QSharedPointer<BrowserContextAdapter> browserContextAdapter() = 0; virtual WebContentsAdapter* webContentsAdapter() = 0; + }; } // namespace QtWebEngineCore |