1 files changed, 49 insertions, 29 deletions

diff --git a/src/corelib/doc/src/datastreamformat.qdoc b/src/corelib/doc/src/datastreamformat.qdoc
index 303d374678..65b7eb5a20 100644
--- a/src/corelib/doc/src/datastreamformat.qdoc
+++ b/src/corelib/doc/src/datastreamformat.qdoc
@@ -1,29 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
 /*!
     \page datastreamformat.html
@@ -31,7 +7,7 @@
     \brief List of data types that can be serialized by QDataStream.
 
     The \l QDataStream class allows you to serialize the Qt data types
-    listed in this section as of \l{QDataStream::setVersion()}{version 18}.
+    listed in this section.
 
     It is always best to cast integers to a Qt integer type, such as
     \l{qint16} or \l{quint32}, when reading and writing. This ensures that
@@ -55,7 +31,11 @@
     \li QBitArray
     \li QBrush
     \li QByteArray
+    \li QCborArray
+    \li QCborMap
+    \li QCborValue
     \li QColor
+    \li QColorSpace
     \li QCursor
     \li QDate
     \li QDateTime
@@ -63,33 +43,73 @@
     \li QFont
     \li QGenericMatrix
     \li QHash<Key, T>
+    \li QHostAddress
     \li QIcon
     \li QImage
+    \li QJsonArray
+    \li QJsonDocument
+    \li QJsonObject
+    \li QJsonValue
     \li QKeySequence
+    \li QLine
+    \li QLineF
     \li QList<T>
+    \li QListWidgetItem
+    \li QLocale
     \li QMap<Key, T>
     \li QMargins
+    \li QMarginsF
     \li QMatrix4x4
-    \li QPair<T1, T2>
+    \li QModelIndex
+    \li QModelIndexList
+    \li QMultiHash<Key
+    \li QMultiMap<Key
+    \li QNetworkCacheMetaData
+    \li QNetworkCacheMetaData::AttributesMap
+    \li QPageRanges
+    \li QPainterPath
+    \li std::pair<T1, T2>
     \li QPalette
     \li QPen
     \li QPicture
     \li QPixmap
     \li QPoint
+    \li QPointF
+    \li QPolygon
+    \li QPolygonF
     \li QQuaternion
     \li QRect
+    \li QRectF
     \li QRegularExpression
     \li QRegion
+    \li QSet
     \li QSize
+    \li QSizeF
+    \li QSizePolicy
+    \li QStandardItem
     \li QString
+    \li QTableWidgetItem
+    \li QTextBlockFormat
+    \li QTextCharFormat
+    \li QTextFormat
+    \li QTextFrameFormat
+    \li QTextLength
+    \li QTextListFormat
+    \li QTextTableCellFormat
+    \li QTimeZone
     \li QTime
     \li QTransform
+    \li QTreeWidgetItem
+    \li QTypeRevision
     \li QUrl
+    \li QUuid
     \li QVariant
     \li QVector2D
     \li QVector3D
     \li QVector4D
+    \li QVersionNumber
     \endlist
 
-    \sa {JSON Support in Qt}
+    \sa {JSON Support in Qt}, {CBOR Support in Qt}
+
 */