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

Conflicts:
	.qmake.conf

Change-Id: I43531e087bb810889d5c1fbfcdffb29b78804839

2 files changed, 6 insertions, 2 deletions

diff --git a/src/corelib/tools/qfreelist_p.h b/src/corelib/tools/qfreelist_p.h
index a8d1132d06..2f98cf5cc1 100644
--- a/src/corelib/tools/qfreelist_p.h
+++ b/src/corelib/tools/qfreelist_p.h
@@ -207,7 +207,11 @@ public:
 
 template <typename T, typename ConstantsType>
 Q_DECL_CONSTEXPR inline QFreeList<T, ConstantsType>::QFreeList()
-    : _next(ConstantsType::InitialNextValue)
+    :
+#if defined(Q_COMPILER_CONSTEXPR)
+      _v{}, // uniform initialization required
+#endif
+      _next(ConstantsType::InitialNextValue)
 { }
 
 template <typename T, typename ConstantsType>
diff --git a/src/corelib/tools/qlocale_tools.cpp b/src/corelib/tools/qlocale_tools.cpp
index 762f4f36dc..3e4f37501e 100644
--- a/src/corelib/tools/qlocale_tools.cpp
+++ b/src/corelib/tools/qlocale_tools.cpp
@@ -370,7 +370,7 @@ double asciiToDouble(const char *num, int numLen, bool &ok, int &processed,
                 // if a digit before any 'e' is not 0, then a non-zero number was intended.
                 ok = false;
                 return 0.0;
-            } else if (num[i] == 'e') {
+            } else if (num[i] == 'e' || num[i] == 'E') {
                 break;
             }
         }