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

 Conflicts:
	src/corelib/io/qstorageinfo_unix.cpp
	src/network/ssl/qsslsocket_openssl.cpp

Change-Id: Ibc9ce799bef62d60d616beaa9fbde8ebeadfbc20

1 files changed, 6 insertions, 4 deletions

diff --git a/src/corelib/serialization/qjsoncbor.cpp b/src/corelib/serialization/qjsoncbor.cpp
index dc5f384108..e0c390f610 100644
--- a/src/corelib/serialization/qjsoncbor.cpp
+++ b/src/corelib/serialization/qjsoncbor.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 Intel Corporation.
+** Copyright (C) 2019 Intel Corporation.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -598,10 +598,12 @@ QCborValue QCborValue::fromJsonValue(const QJsonValue &v)
     switch (v.type()) {
     case QJsonValue::Bool:
         return v.b;
-    case QJsonValue::Double:
-        if (v.dbl == qint64(v.dbl))
-            return qint64(v.dbl);
+    case QJsonValue::Double: {
+        qint64 i;
+        if (convertDoubleTo(v.dbl, &i))
+            return i;
         return v.dbl;
+    }
     case QJsonValue::String:
         return v.toString();
     case QJsonValue::Array: