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

 Conflicts:
	src/widgets/styles/qstyle_p.h

Change-Id: I0e6e856bd6628da1135b3ba674dddffabbeb5c09

1 files changed, 10 insertions, 0 deletions

diff --git a/src/corelib/serialization/qcborstream.cpp b/src/corelib/serialization/qcborstream.cpp
index 20a7e14dde..1392b4d8d6 100644
--- a/src/corelib/serialization/qcborstream.cpp
+++ b/src/corelib/serialization/qcborstream.cpp
@@ -101,6 +101,16 @@ static CborError _cbor_value_dup_string(const CborValue *, void **, size_t *, Cb
     Q_UNREACHABLE();
     return CborErrorInternalError;
 }
+static CborError cbor_value_get_half_float_as_float(const CborValue *, float *)
+{
+    Q_UNREACHABLE();
+    return CborErrorInternalError;
+}
+static CborError cbor_encode_float_as_half_float(CborEncoder *, float)
+{
+    Q_UNREACHABLE();
+    return CborErrorInternalError;
+}
 QT_WARNING_POP
 
 Q_DECLARE_TYPEINFO(CborEncoder, Q_PRIMITIVE_TYPE);