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

 Conflicts:
	src/corelib/kernel/qmetatype.cpp

Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a

2 files changed, 4 insertions, 7 deletions

diff --git a/src/xml/doc/src/xml-processing.qdoc b/src/xml/doc/src/xml-processing.qdoc
index 4dfcbf4722..8ac279f8b6 100644
--- a/src/xml/doc/src/xml-processing.qdoc
+++ b/src/xml/doc/src/xml-processing.qdoc
@@ -72,7 +72,6 @@
     \title An Introduction to Namespaces
     \target namespaces
 
-    \contentspage XML Processing
     \nextpage XML Streaming
 
     Parts of the Qt XML module documentation assume that you are familiar
@@ -211,7 +210,6 @@
     \title XML Streaming
 
     \previouspage An Introduction to Namespaces
-    \contentspage XML Processing
     \nextpage The SAX Interface
 
     Since version 4.3, Qt provides two new classes for reading and
@@ -290,7 +288,6 @@
     \title The SAX interface
 
     \previouspage XML Streaming
-    \contentspage XML Processing
     \nextpage Working with the DOM Tree
 
     SAX is an event-based standard interface for XML parsers.
@@ -520,7 +517,6 @@
     \target dom
 
     \previouspage The SAX Interface
-    \contentspage XML Processing
 
     DOM Level 2 is a W3C Recommendation for XML interfaces that maps the
     constituents of an XML document to a tree structure. The specification
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);
 }