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

Change-Id: If1baf48f0f396fb223672d14f0e1847ac42ca1a6

4 files changed, 24 insertions, 2 deletions

diff --git a/src/corelib/serialization/qcborarray.cpp b/src/corelib/serialization/qcborarray.cpp
index 05403795b0..921fcf2fca 100644
--- a/src/corelib/serialization/qcborarray.cpp
+++ b/src/corelib/serialization/qcborarray.cpp
@@ -186,11 +186,21 @@ qsizetype QCborArray::size() const noexcept
 }
 
 /*!
+    Empties this array.
+
+    \sa isEmpty()
+ */
+void QCborArray::clear()
+{
+    d.reset();
+}
+
+/*!
     \fn bool QCborArray::isEmpty() const
 
     Returns true if this QCborArray is empty (that is if size() is 0).
 
-    \sa size()
+    \sa size(), clear()
  */
 
 /*!
diff --git a/src/corelib/serialization/qcborarray.h b/src/corelib/serialization/qcborarray.h
index 6b07b52a02..f24bb41759 100644
--- a/src/corelib/serialization/qcborarray.h
+++ b/src/corelib/serialization/qcborarray.h
@@ -180,6 +180,7 @@ public:
 
     qsizetype size() const noexcept;
     bool isEmpty() const { return size() == 0; }
+    void clear();
 
     QCborValue at(qsizetype i) const;
     QCborValue first() const { return at(0); }
diff --git a/src/corelib/serialization/qcbormap.cpp b/src/corelib/serialization/qcbormap.cpp
index b18945ded1..33f9249993 100644
--- a/src/corelib/serialization/qcbormap.cpp
+++ b/src/corelib/serialization/qcbormap.cpp
@@ -270,7 +270,7 @@ QCborMap &QCborMap::operator=(const QCborMap &other) noexcept
 
     Returns true if this map is empty (that is, size() is 0).
 
-    \sa size()
+    \sa size(), clear()
  */
 
 /*!
@@ -284,6 +284,16 @@ qsizetype QCborMap::size() const noexcept
 }
 
 /*!
+    Empties this map.
+
+    \sa isEmpty()
+ */
+void QCborMap::clear()
+{
+    d.reset();
+}
+
+/*!
     Returns a list of all keys in this map.
 
     \sa QMap::keys(), QHash::keys()
diff --git a/src/corelib/serialization/qcbormap.h b/src/corelib/serialization/qcbormap.h
index c895abfa59..45ef430e40 100644
--- a/src/corelib/serialization/qcbormap.h
+++ b/src/corelib/serialization/qcbormap.h
@@ -184,6 +184,7 @@ public:
 
     qsizetype size() const noexcept Q_DECL_PURE_FUNCTION;
     bool isEmpty() const { return size() == 0; }
+    void clear();
     QVector<QCborValue> keys() const;
 
     QCborValue value(qint64 key) const