summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/datavisualizationqml2/colorgradient.cpp2
-rw-r--r--src/datavisualizationqml2/declarativerendernode.cpp5
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);