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

4 files changed, 16 insertions, 11 deletions

diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp
index 8a9d86b7c5..5da8419fe8 100644
--- a/src/corelib/animation/qabstractanimation.cpp
+++ b/src/corelib/animation/qabstractanimation.cpp
@@ -1063,7 +1063,7 @@ QAbstractAnimation::~QAbstractAnimation()
     if (d->state != Stopped) {
         QAbstractAnimation::State oldState = d->state;
         d->state = Stopped;
-        emit stateChanged(oldState, d->state);
+        emit stateChanged(d->state, oldState);
         if (oldState == QAbstractAnimation::Running)
             QAnimationTimer::unregisterAnimation(this);
     }
diff --git a/src/corelib/io/qstorageinfo_unix.cpp b/src/corelib/io/qstorageinfo_unix.cpp
index 6b821b0fe9..b23ee3ad8d 100644
--- a/src/corelib/io/qstorageinfo_unix.cpp
+++ b/src/corelib/io/qstorageinfo_unix.cpp
@@ -846,6 +846,9 @@ QList<QStorageInfo> QStorageInfoPrivate::mountedVolumes()
 
         const QString mountDir = it.rootPath();
         QStorageInfo info(mountDir);
+        info.d->device = it.device();
+        info.d->fileSystemType = it.fileSystemType();
+        info.d->subvolume = it.subvolume();
         if (info.bytesTotal() == 0 && info != root())
             continue;
         volumes.append(info);
diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp
index 75cc813298..4f4a29b41b 100644
--- a/src/corelib/kernel/qcoreapplication_win.cpp
+++ b/src/corelib/kernel/qcoreapplication_win.cpp
@@ -694,6 +694,12 @@ static const char *winPosInsertAfter(quintptr h)
 
 static const char *sessionMgrLogOffOption(uint p)
 {
+#ifndef ENDSESSION_CLOSEAPP
+#define ENDSESSION_CLOSEAPP 0x00000001
+#endif
+#ifndef ENDSESSION_CRITICAL
+#define ENDSESSION_CRITICAL 0x40000000
+#endif
     static const QWinMessageMapping<uint> values[] = {
         {ENDSESSION_CLOSEAPP, "Close application"},
         {ENDSESSION_CRITICAL, "Force application end"},
@@ -887,12 +893,6 @@ QString decodeMSG(const MSG& msg)
                 parameters += QLatin1Char(')');
             }
             break;
-#ifndef ENDSESSION_CLOSEAPP
-#define ENDSESSION_CLOSEAPP 0x00000001
-#endif
-#ifndef ENDSESSION_CRITICAL
-#define ENDSESSION_CRITICAL 0x40000000
-#endif
         case WM_QUERYENDSESSION:
             parameters = QLatin1String("End session: ");
             if (const char *logoffOption = sessionMgrLogOffOption(uint(wParam)))
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: