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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/core/web_contents_adapter.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index 01b41fbe8..9f1000910 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -79,6 +79,8 @@ #include <QtGui/qaccessible.h> #include <QtWebChannel/QWebChannel> +namespace QtWebEngineCore { + static const int kTestWindowWidth = 800; static const int kTestWindowHeight = 600; static const int kHistoryStreamVersion = 3; @@ -639,7 +641,7 @@ void WebContentsAdapter::clearNavigationHistory() void WebContentsAdapter::serializeNavigationHistory(QDataStream &output) { Q_D(WebContentsAdapter); - ::serializeNavigationHistory(d->webContents->GetController(), output); + QtWebEngineCore::serializeNavigationHistory(d->webContents->GetController(), output); } void WebContentsAdapter::setZoomFactor(qreal factor) @@ -829,3 +831,5 @@ void WebContentsAdapter::setWebChannel(QWebChannel *channel) } channel->connectTo(d->webChannelTransport.get()); } + +} // namespace QtWebEngineCore |