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

 Conflicts:
	src/widgets/styles/qstylesheetstyle.cpp

Change-Id: I3a503b44ae413fbc0a90f4af70b8f84daffd86ad

1 files changed, 2 insertions, 2 deletions

diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 6a0e2f0338..4f6ac1eb97 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -1405,10 +1405,10 @@ void WriteInitialization::writeProperties(const QString &varName,
             propertyValue += QLatin1Char(')');
             break;
         case DomProperty::Float:
-            propertyValue = QString::number(p->elementFloat());
+            propertyValue = QString::number(p->elementFloat(), 'f', 8);
             break;
         case DomProperty::Double:
-            propertyValue = QString::number(p->elementDouble());
+            propertyValue = QString::number(p->elementDouble(), 'f', 15);
             break;
         case DomProperty::Char: {
             const DomChar *c = p->elementChar();