From 2c769e64ad58da5454a44affb64b9e003381da35 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@qt.io>
Date: Thu, 25 Aug 2016 14:31:05 +0300
Subject: Fix crash on some qml examples when using software backend

The texture needs to be set before prepending the node, or
QSGSoftwareRenderableNode::update() will crash under some conditions.

Change-Id: I86bd9752ec68f5385a030eb92e9f7057d7382717
Reviewed-by: Mika Salmela <mika.salmela@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
---
 src/chartsqml2/declarativechartnode.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/chartsqml2/declarativechartnode.cpp b/src/chartsqml2/declarativechartnode.cpp
index 7019ed58..0b8f5a5a 100644
--- a/src/chartsqml2/declarativechartnode.cpp
+++ b/src/chartsqml2/declarativechartnode.cpp
@@ -76,9 +76,11 @@ void DeclarativeChartNode::createTextureFromImage(const QImage &chartImage)
         m_imageNode = m_window->createImageNode();
         m_imageNode->setFlag(OwnedByParent);
         m_imageNode->setOwnsTexture(true);
+        m_imageNode->setTexture(texture);
         prependChildNode(m_imageNode);
+    } else {
+        m_imageNode->setTexture(texture);
     }
-    m_imageNode->setTexture(texture);
     if (!m_rect.isEmpty())
         m_imageNode->setRect(m_rect);
 }
-- 
cgit v1.2.3