Merge remote-tracking branch 'origin/5.13' into 5.14

 Conflicts:
	src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp
	tests/auto/quick/qquickpathview/tst_qquickpathview.cpp

Change-Id: I117c8d62b21800329d1035021d312d9924f83a1b

2 files changed, 7 insertions, 1 deletions

diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarespritenode.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarespritenode.cpp
index d4e5e98d68..17e8bdc2f9 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwarespritenode.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarespritenode.cpp
@@ -49,6 +49,11 @@ QSGSoftwareSpriteNode::QSGSoftwareSpriteNode()
     setGeometry((QSGGeometry*)1);
 }
 
+QSGSoftwareSpriteNode::~QSGSoftwareSpriteNode()
+{
+    delete m_texture;
+}
+
 void QSGSoftwareSpriteNode::setTexture(QSGTexture *texture)
 {
     m_texture = qobject_cast<QSGSoftwarePixmapTexture*>(texture);
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarespritenode_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwarespritenode_p.h
index 577a30c051..4015537395 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwarespritenode_p.h
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarespritenode_p.h
@@ -64,6 +64,7 @@ class QSGSoftwareSpriteNode : public QSGSpriteNode
 {
 public:
     QSGSoftwareSpriteNode();
+    ~QSGSoftwareSpriteNode() override;
 
     void setTexture(QSGTexture *texture) override;
     void setTime(float time) override;
@@ -81,7 +82,7 @@ public:
 
 private:
 
-    QSGSoftwarePixmapTexture *m_texture;
+    QSGSoftwarePixmapTexture *m_texture = nullptr;
     float m_time;
     QPoint m_sourceA;
     QPoint m_sourceB;