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

 Conflicts:
	src/corelib/kernel/qmetatype.cpp

Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a

1 files changed, 4 insertions, 3 deletions

diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp
index 39cf0c2653..022de70090 100644
--- a/src/xml/dom/qdom.cpp
+++ b/src/xml/dom/qdom.cpp
@@ -65,6 +65,7 @@
 
 
 #include <stdio.h>
+#include <limits>
 
 QT_BEGIN_NAMESPACE
 
@@ -4364,7 +4365,7 @@ void QDomElement::setAttribute(const QString& name, float value)
     if (!impl)
         return;
     QString x;
-    x.setNum(value);
+    x.setNum(value, 'g', 8);
     IMPL->setAttribute(name, x);
 }
 
@@ -4378,7 +4379,7 @@ void QDomElement::setAttribute(const QString& name, double value)
     if (!impl)
         return;
     QString x;
-    x.setNum(value);
+    x.setNum(value, 'g', 17);
     IMPL->setAttribute(name, x);
 }
 
@@ -4547,7 +4548,7 @@ void QDomElement::setAttributeNS(const QString& nsURI, const QString& qName, dou
     if (!impl)
         return;
     QString x;
-    x.setNum(value);
+    x.setNum(value, 'g', 17);
     IMPL->setAttributeNS(nsURI, qName, x);
 }