Merge "Merge remote-tracking branch 'origin/5.15' into dev"

3 files changed, 6 insertions, 3 deletions

diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp
index daeedf3c..2f2cf63b 100644
--- a/src/datavisualization/engine/q3dbars.cpp
+++ b/src/datavisualization/engine/q3dbars.cpp
@@ -157,7 +157,7 @@ QBar3DSeries *Q3DBars::primarySeries() const
  * to the axes. If the newly added series has specified a selected bar, it will be highlighted and
  * any existing selection will be cleared. Only one added series can have an active selection.
  *
- * /sa seriesList(), primarySeries
+ * \sa seriesList(), primarySeries
  */
 void Q3DBars::addSeries(QBar3DSeries *series)
 {
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 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);