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

Conflicts:
	src/qml/jsruntime/qv4numberobject.cpp

Change-Id: I4e66a03ef4d99cec192c9da30c028fd8c1f4ac0d

diff --cc src/qml/jsruntime/qv4numberobject.cpp
index d8c9d89,236091b..89ff110
--- 1/src/qml/jsruntime/qv4numberobject.cpp
--- 2/src/qml/jsruntime/qv4numberobject.cpp
+++ b/src/qml/jsruntime/qv4numberobject.cpp
@@@ -204,11 -202,17 +204,17 @@@ ReturnedValue NumberPrototype::method_t
          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, v)->asReturnedValue();
 -    return ctx->d()->engine->newString(str)->asReturnedValue();
 +        return RuntimeHelpers::stringFromNumber(ctx->engine(), v)->asReturnedValue();
 +    return scope.engine->newString(str)->asReturnedValue();
  }
  
  ReturnedValue NumberPrototype::method_toExponential(CallContext *ctx)

diff --cc src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
Simple merge

diff --cc src/quick/scenegraph/qsgthreadedrenderloop.cpp
Simple merge

diff --cc src/quick/scenegraph/qsgthreadedrenderloop_p.h
Simple merge

diff --cc tests/auto/qml/qjsengine/tst_qjsengine.cpp
index c938e19,2b7b1fc..61816b6
--- 1/tests/auto/qml/qjsengine/tst_qjsengine.cpp
--- 2/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
@@@ -174,8 -173,8 +174,9 @@@ private slots
  
      void privateMethods();
  
 +    void engineForObject();
      void intConversion_QTBUG43309();
+     void toFixed();
  
  signals:
      void testSignal();