1 files changed, 24 insertions, 13 deletions

diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp
index aa3fc82b6e..cd29f2fcc2 100644
--- a/src/corelib/itemmodels/qabstractitemmodel.cpp
+++ b/src/corelib/itemmodels/qabstractitemmodel.cpp
@@ -19,6 +19,8 @@
 #include <qdatetime.h>
 #include <qloggingcategory.h>
 
+#include <functional>
+
 #include <limits.h>
 
 QT_BEGIN_NAMESPACE
@@ -210,7 +212,7 @@ void QPersistentModelIndexData::destroy(QPersistentModelIndexData *data)
 */
 
 /*!
-    \fn template <typename Container> QModelRoleDataSpan::QModelRoleDataSpan(Container &c) noexcept
+    \fn template <typename Container, QModelRoleDataSpan::if_compatible_container<Container> = true> QModelRoleDataSpan::QModelRoleDataSpan(Container &c) noexcept
 
     Constructs an QModelRoleDataSpan spanning over the container \a c,
     which can be any contiguous container of QModelRoleData objects.
@@ -380,7 +382,7 @@ QPersistentModelIndex::~QPersistentModelIndex()
   model index are used when comparing with another persistent model index.
 */
 
-bool QPersistentModelIndex::operator==(const QPersistentModelIndex &other) const
+bool QPersistentModelIndex::operator==(const QPersistentModelIndex &other) const noexcept
 {
     if (d && other.d)
         return d->index == other.d->index;
@@ -397,12 +399,12 @@ bool QPersistentModelIndex::operator==(const QPersistentModelIndex &other) const
     model index are used when comparing with another persistent model index.
 */
 
-bool QPersistentModelIndex::operator<(const QPersistentModelIndex &other) const
+bool QPersistentModelIndex::operator<(const QPersistentModelIndex &other) const noexcept
 {
     if (d && other.d)
         return d->index < other.d->index;
 
-    return d < other.d;
+    return std::less<>{}(d, other.d);
 }
 
 /*!
@@ -475,7 +477,7 @@ QPersistentModelIndex::operator QModelIndex() const
     model index are used when comparing with another model index.
 */
 
-bool QPersistentModelIndex::operator==(const QModelIndex &other) const
+bool QPersistentModelIndex::operator==(const QModelIndex &other) const noexcept
 {
     if (d)
         return d->index == other;
@@ -489,7 +491,7 @@ bool QPersistentModelIndex::operator==(const QModelIndex &other) const
     location as the \a other model index; otherwise returns \c{false}.
 */
 
-bool QPersistentModelIndex::operator!=(const QModelIndex &other) const
+bool QPersistentModelIndex::operator!=(const QModelIndex &other) const noexcept
 {
     if (d)
         return d->index != other;
@@ -684,6 +686,7 @@ QDebug operator<<(QDebug dbg, const QPersistentModelIndex &idx)
 
 class QEmptyItemModel : public QAbstractItemModel
 {
+    Q_OBJECT
 public:
     explicit QEmptyItemModel(QObject *parent = nullptr) : QAbstractItemModel(parent) {}
     QModelIndex index(int, int, const QModelIndex &) const override { return QModelIndex(); }
@@ -1497,10 +1500,12 @@ void QAbstractItemModel::resetInternalData()
     rows to the model, \l{QAbstractItemModel::}{beginInsertRows()} and
     \l{QAbstractItemModel::}{endInsertRows()} must be called.
 
+    \include models.qdocinc {thread-safety-section1}{QAbstractItemModel}
+
     \sa {Model Classes}, {Model Subclassing Reference}, QModelIndex,
         QAbstractItemView, {Using drag and drop with item views},
-        {Simple DOM Model Example}, {Simple Tree Model Example},
-        {Editable Tree Model Example}, {Fetch More Example}
+        {Simple Tree Model Example}, {Editable Tree Model Example},
+        {Fetch More Example}
 */
 
 /*!
@@ -1739,7 +1744,13 @@ QAbstractItemModel::~QAbstractItemModel()
 
     For example:
 
-    \snippet ../widgets/itemviews/simpledommodel/dommodel.cpp 2
+    \code
+    int MyModel::columnCount(const QModelIndex &parent) const
+    {
+        Q_UNUSED(parent);
+        return 3;
+    }
+    \endcode
 
     \note When implementing a table based model, columnCount() should return 0
     when the parent is valid.
@@ -3728,10 +3739,9 @@ void QAbstractItemModel::multiData(const QModelIndex &index, QModelRoleDataSpan
     \note Some general guidelines for subclassing models are available in the
     \l{Model Subclassing Reference}.
 
-    \note
+    \include models.qdocinc {thread-safety-section1}{QAbstractTableModel}
 
-    \sa {Model Classes}, QAbstractItemModel, QAbstractListModel,
-    {Pixelator Example}
+    \sa {Model Classes}, QAbstractItemModel, QAbstractListModel
 */
 
 /*!
@@ -3882,7 +3892,7 @@ Qt::ItemFlags QAbstractTableModel::flags(const QModelIndex &index) const
     \l{Model Subclassing Reference}.
 
     \sa {Model Classes}, {Model Subclassing Reference}, QAbstractItemView,
-        QAbstractTableModel, {Item Views Puzzle Example}
+        QAbstractTableModel
 */
 
 /*!
@@ -4160,3 +4170,4 @@ void QAbstractItemModelPrivate::Persistent::insertMultiAtEnd(const QModelIndex&
 QT_END_NAMESPACE
 
 #include "moc_qabstractitemmodel.cpp"
+#include "qabstractitemmodel.moc"