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

Conflicts:
	src/qml/jsruntime/qv4numberobject.cpp

Change-Id: I4e66a03ef4d99cec192c9da30c028fd8c1f4ac0d

src/qml/jsruntime/qv4numberobject.cpp

@@ -204,9 +204,15 @@ ReturnedValue NumberPrototype::method_toFixed(CallContext *ctx)
         str = QString::fromLatin1("NaN");
     else if (qIsInf(v))
         str = QString::fromLatin1(v < 0 ? "-Infinity" : "Infinity");
-    else if (v < 1.e21)
-        str = QString::number(v, 'f', int (fdigits));
-    else
+    else if (v < 1.e21) {
+        char buf[100];
+        double_conversion::StringBuilder builder(buf, sizeof(buf));
+        double_conversion::DoubleToStringConverter::EcmaScriptConverter().ToFixed(v, fdigits, &builder);
+        str = QString::fromLatin1(builder.Finalize());
+        // At some point, the 3rd party double-conversion code should be moved to qtcore.
+        // When that's done, we can use:
+//        str = QString::number(v, 'f', int (fdigits));
+    } else
         return RuntimeHelpers::stringFromNumber(ctx->engine(), v)->asReturnedValue();
     return scope.engine->newString(str)->asReturnedValue();
 }

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);
 

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();

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 *);

tests/auto/qml/qjsengine/tst_qjsengine.cpp

@@ -176,6 +176,7 @@ private slots:
 
     void engineForObject();
     void intConversion_QTBUG43309();
+    void toFixed();
 
 signals:
     void testSignal();
@@ -3652,6 +3653,18 @@ void tst_QJSEngine::intConversion_QTBUG43309()
     QCOMPARE(result.toNumber(), 25.0);
 }
 
+// QTBUG-44039 and QTBUG-43885:
+void tst_QJSEngine::toFixed()
+{
+    QJSEngine engine;
+    QJSValue result = engine.evaluate(QStringLiteral("(12.5).toFixed()"));
+    QVERIFY(result.isString());
+    QCOMPARE(result.toString(), QStringLiteral("13"));
+    result = engine.evaluate(QStringLiteral("(12.05).toFixed(1)"));
+    QVERIFY(result.isString());
+    QCOMPARE(result.toString(), QStringLiteral("12.1"));
+}
+
 QTEST_MAIN(tst_QJSEngine)
 
 #include "tst_qjsengine.moc"

tests/global/global.cfg

@@ -1,7 +1,8 @@
 <config>
 <modules>
-<module name="QtQml"       qtname="qml"/>
-<module name="QtQuick"     qtname="quick"/>
-<module name="QtQuickTest" qtname="qmltest"/>
+<module name="QtQml"          qtname="qml"/>
+<module name="QtQuick"        qtname="quick"/>
+<module name="QtQuickTest"    qtname="qmltest"/>
+<module name="QtQuickWidgets" qtname="quickwidgets"/>
 </modules>
 </config>