Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
	src/qml/jsruntime/qv4numberobject.cpp

Change-Id: I4e66a03ef4d99cec192c9da30c028fd8c1f4ac0d

3 files changed, 8 insertions, 2 deletions

diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
index 8f94a86026..886e614620 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
@@ -2899,7 +2899,7 @@ void Renderer::visualizeChangesPrepare(Node *n, uint parentChanges)
 void Renderer::visualizeChanges(Node *n)
 {
 
-    if (n->type() == QSGNode::GeometryNodeType && m_visualizeChanceSet.contains(n)) {
+    if (n->type() == QSGNode::GeometryNodeType && n->element()->batch && m_visualizeChanceSet.contains(n)) {
         uint dirty = m_visualizeChanceSet.value(n);
         bool tinted = (dirty & QSGNODE_DIRTY_PARENT) != 0;
 
@@ -2934,7 +2934,7 @@ void Renderer::visualizeChanges(Node *n)
 
 void Renderer::visualizeOverdraw_helper(Node *node)
 {
-    if (node->type() == QSGNode::GeometryNodeType) {
+    if (node->type() == QSGNode::GeometryNodeType && node->element()->batch) {
         VisualizeShader *shader = static_cast<VisualizeShader *>(m_shaderManager->visualizeProgram);
         QSGGeometryNode *gn = static_cast<QSGGeometryNode *>(node->sgNode);
 
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
index 460f92edd7..6974271dc7 100644
--- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp
+++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
@@ -694,6 +694,11 @@ QSGThreadedRenderLoop::QSGThreadedRenderLoop()
     m_animation_driver->install();
 }
 
+QSGThreadedRenderLoop::~QSGThreadedRenderLoop()
+{
+    delete sg;
+}
+
 QSGRenderContext *QSGThreadedRenderLoop::createRenderContext(QSGContext *sg) const
 {
     return sg->createRenderContext();
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop_p.h b/src/quick/scenegraph/qsgthreadedrenderloop_p.h
index f371efc1a1..d5ffbf10a3 100644
--- a/src/quick/scenegraph/qsgthreadedrenderloop_p.h
+++ b/src/quick/scenegraph/qsgthreadedrenderloop_p.h
@@ -49,6 +49,7 @@ class QSGThreadedRenderLoop : public QSGRenderLoop
     Q_OBJECT
 public:
     QSGThreadedRenderLoop();
+    ~QSGThreadedRenderLoop();
 
     void show(QQuickWindow *) {}
     void hide(QQuickWindow *);