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

Conflicts:
	.qmake.conf
	src/qml/jsruntime/qv4context_p.h
	src/qml/jsruntime/qv4debugging.cpp
	src/qml/jsruntime/qv4engine.cpp
	src/qml/jsruntime/qv4functionobject_p.h
	src/qml/jsruntime/qv4qobjectwrapper.cpp
	src/quick/scenegraph/shaders/visualization.frag
	tests/auto/qml/qjsengine/tst_qjsengine.cpp

Change-Id: I492e8546c278f80a300a2129e9a29d861e144a30

1 files changed, 4 insertions, 1 deletions

diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
index aef5b4ee79..fd9b2a4480 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
@@ -2828,7 +2828,10 @@ void Renderer::visualizeBatch(Batch *b)
             g = gn->geometry();
             shader->setUniformValue(shader->matrix, matrix * *gn->matrix());
             glVertexAttribPointer(a.position, a.tupleSize, a.type, false, g->sizeOfVertex(), (void *) (qintptr) offset);
-            glDrawElements(g->drawingMode(), g->indexCount(), g->indexType(), g->indexData());
+            if (g->indexCount())
+                glDrawElements(g->drawingMode(), g->indexCount(), g->indexType(), g->indexData());
+            else
+                glDrawArrays(g->drawingMode(), 0, g->vertexCount());
             offset += g->sizeOfVertex() * g->vertexCount();
             e = e->nextInBatch;
         }