diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-03-12 15:51:11 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-03-13 10:13:37 +0100 |
| commit | 6e356d55c8eabcc96223e25182458b78378dd5a4 (patch) | |
| tree | c13b6a0c52a253966ae588c2252b33d5f8392a60 /src/core/web_contents_adapter.h | |
| parent | f4c03d68cff2b107fe19dfe210e0207215c04f2d (diff) | |
| parent | 2cf54e48922a7d379fb7e212966d05bc402e475d (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/webengine/api/qquickwebengineview_p_p.h
src/webengine/ui_delegates_manager.cpp
src/webengine/ui_delegates_manager.h
src/webenginewidgets/api/qwebenginepage_p.h
Change-Id: I8052de4d3b2e68a950832226f6f99e2aafca5505
Diffstat (limited to 'src/core/web_contents_adapter.h')
| -rw-r--r-- | src/core/web_contents_adapter.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h index 0f8fbf947..2973f9948 100644 --- a/src/core/web_contents_adapter.h +++ b/src/core/web_contents_adapter.h @@ -49,15 +49,18 @@ namespace content { class WebContents; struct WebPreferences; } -class BrowserContextQt; -class MessagePassingInterface; -class WebContentsAdapterPrivate; QT_BEGIN_NAMESPACE class QAccessibleInterface; class QWebChannel; QT_END_NAMESPACE +namespace QtWebEngineCore { + +class BrowserContextQt; +class MessagePassingInterface; +class WebContentsAdapterPrivate; + class QWEBENGINE_EXPORT WebContentsAdapter : public QSharedData { public: static QExplicitlySharedDataPointer<WebContentsAdapter> createFromSerializedNavigationHistory(QDataStream &input, WebContentsAdapterClient *adapterClient); @@ -125,9 +128,12 @@ public: content::WebContents *webContents() const; private: - Q_DISABLE_COPY(WebContentsAdapter); - Q_DECLARE_PRIVATE(WebContentsAdapter); + Q_DISABLE_COPY(WebContentsAdapter) + Q_DECLARE_PRIVATE(WebContentsAdapter) QScopedPointer<WebContentsAdapterPrivate> d_ptr; }; + +} // namespace QtWebEngineCore + #endif // WEB_CONTENTS_ADAPTER_H |