diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-20 16:01:37 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-20 16:04:42 +0100 |
| commit | 1f474fcc4cd47a85ce8d99f07d18b46ef2af5898 (patch) | |
| tree | d4e52b5ac98343b4c2417d622164bf320d781a59 /src/core/web_contents_adapter_p.h | |
| parent | 4cc28c7c89f794d469f5e8f778ff05effe8c646f (diff) | |
| parent | 1173d48149a8133b607894b67e1ec32de68e21e8 (diff) | |
Merge branch '5.6' into dev
Change-Id: I05fe27b8321944cf68cc96dfa9dfcaeb54c8c8cd
Diffstat (limited to 'src/core/web_contents_adapter_p.h')
| -rw-r--r-- | src/core/web_contents_adapter_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/web_contents_adapter_p.h b/src/core/web_contents_adapter_p.h index 9b4128749..093b9059d 100644 --- a/src/core/web_contents_adapter_p.h +++ b/src/core/web_contents_adapter_p.h @@ -60,7 +60,7 @@ QT_FORWARD_DECLARE_CLASS(QWebChannel) namespace QtWebEngineCore { class BrowserContextAdapter; -class QtRenderViewObserverHost; +class RenderViewObserverHostQt; class UserScriptControllerHost; class WebChannelIPCTransportHost; class WebContentsAdapterClient; @@ -75,7 +75,7 @@ public: QExplicitlySharedDataPointer<BrowserContextAdapter> browserContextAdapter; scoped_ptr<content::WebContents> webContents; scoped_ptr<WebContentsDelegateQt> webContentsDelegate; - scoped_ptr<QtRenderViewObserverHost> renderViewObserverHost; + scoped_ptr<RenderViewObserverHostQt> renderViewObserverHost; scoped_ptr<WebChannelIPCTransportHost> webChannelTransport; QWebChannel *webChannel; WebContentsAdapterClient *adapterClient; |