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-24 03:01:11 +0100 |
commit | 2e3983d554e67069a1bd74d5df4486250957c568 (patch) | |
tree | 0ae1f76dba5acb7476a67a87dc7c6f7d5f77c657 /src/datavisualizationqml2 | |
parent | 57029b2a392951eecee8be7d5540762de546ac49 (diff) | |
parent | 407bee91eb83b6ff2df6e5d99366971bf21e2637 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I9152493c8aed299f0bcffc03651b05d6ae01db22
Diffstat (limited to 'src/datavisualizationqml2')
-rw-r--r-- | src/datavisualizationqml2/colorgradient.cpp | 2 | ||||
-rw-r--r-- | src/datavisualizationqml2/declarativerendernode.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/datavisualizationqml2/colorgradient.cpp b/src/datavisualizationqml2/colorgradient.cpp index 125b9545..edcca2ec 100644 --- a/src/datavisualizationqml2/colorgradient.cpp +++ b/src/datavisualizationqml2/colorgradient.cpp @@ -77,7 +77,7 @@ ColorGradient::~ColorGradient() QQmlListProperty<ColorGradientStop> ColorGradient::stops() { - return QQmlListProperty<ColorGradientStop>(this, m_stops); + return QQmlListProperty<ColorGradientStop>(this, &m_stops); } void ColorGradient::doUpdate() diff --git a/src/datavisualizationqml2/declarativerendernode.cpp b/src/datavisualizationqml2/declarativerendernode.cpp index 1e3c3542..eac1a36b 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); |