diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-08 10:12:58 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-08 10:47:57 +0100 |
| commit | 233258f132134caaa3c4acf924b47d7e548865e7 (patch) | |
| tree | 2afbcb2923f13b03fbb1dc15c1c5b3622842ef1e /src/core/delegated_frame_node.cpp | |
| parent | 6666e23ed6252c3ef53c5f17d4f28bfe63736e33 (diff) | |
| parent | 9ef3a8263098c6a32db8b824aabf85587d1f1140 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
src/core/api/qwebengineurlrequestjob.cpp
src/core/browser_context_adapter.cpp
src/core/renderer/user_resource_controller.cpp
src/core/web_engine_context.cpp
src/webenginewidgets/api/qwebenginepage.cpp
Change-Id: I5278e5e22e1776d42975fc94d70ff8ca4f81fb9a
Diffstat (limited to 'src/core/delegated_frame_node.cpp')
| -rw-r--r-- | src/core/delegated_frame_node.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/delegated_frame_node.cpp b/src/core/delegated_frame_node.cpp index 6f4a4e8db..de39300c9 100644 --- a/src/core/delegated_frame_node.cpp +++ b/src/core/delegated_frame_node.cpp @@ -739,6 +739,7 @@ void DelegatedFrameNode::preprocess() if (!mailboxesToFetch.isEmpty()) fetchAndSyncMailboxes(mailboxesToFetch); +#endif // Then render any intermediate RenderPass in order. typedef QPair<int, QSharedPointer<QSGLayer> > Pair; @@ -748,7 +749,6 @@ void DelegatedFrameNode::preprocess() // Proceed with the actual update. pair.second->updateTexture(); } -#endif } static YUVVideoMaterial::ColorSpace toQt(cc::YUVVideoDrawQuad::ColorSpace color_space) |