diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-24 03:01:11 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-26 08:52:12 +0100 |
| commit | 23e00330af664f8e55fc14621a845661efcadf5f (patch) | |
| tree | f063965b93f183333bd4cdf3ee7440725ae9abf1 /src/datavisualizationqml2/declarativerendernode.cpp | |
| parent | 51c361b85ca7fe4194b3c2d2a0e5ebead6cf30ae (diff) | |
| parent | 2e3983d554e67069a1bd74d5df4486250957c568 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/datavisualizationqml2/declarativerendernode.cpp')
| -rw-r--r-- | src/datavisualizationqml2/declarativerendernode.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/datavisualizationqml2/declarativerendernode.cpp b/src/datavisualizationqml2/declarativerendernode.cpp index a1d65a94..a5eb027e 100644 --- a/src/datavisualizationqml2/declarativerendernode.cpp +++ b/src/datavisualizationqml2/declarativerendernode.cpp @@ -113,7 +113,10 @@ void DeclarativeRenderNode::updateFBO() QRectF(0, 1, 1, -1)); delete m_texture; - m_texture = m_window->createTextureFromId(m_fbo->texture(), m_size); + const uint id = m_fbo->texture(); + m_texture = + m_window->createTextureFromNativeObject(QQuickWindow::NativeObjectTexture, + &id, 0 /* nativeLayout */, m_size); m_material.setTexture(m_texture); m_materialO.setTexture(m_texture); |