3 files changed, 19 insertions, 5 deletions
diff --git a/src/corelib/doc/qtcore.qdocconf b/src/corelib/doc/qtcore.qdocconf
index d2b386373a0..b3e4e9d30a9 100644
--- a/src/corelib/doc/qtcore.qdocconf
+++ b/src/corelib/doc/qtcore.qdocconf
@@ -21,7 +21,7 @@ qhp.QtCore.virtualFolder       = qtcore
 qhp.QtCore.indexTitle          = Qt Core
 qhp.QtCore.indexRoot           =
 
-qhp.QtCore.subprojects = manual classes
+qhp.QtCore.subprojects = manual examples classes
 qhp.QtCore.subprojects.manual.title = Qt Core
 qhp.QtCore.subprojects.manual.indexTitle = Qt Core module topics
 qhp.QtCore.subprojects.manual.type = manual
@@ -31,6 +31,11 @@ qhp.QtCore.subprojects.classes.indexTitle = Qt Core C++ Classes
 qhp.QtCore.subprojects.classes.selectors = class fake:headerfile
 qhp.QtCore.subprojects.classes.sortPages = true
 
+qhp.QtCore.subprojects.examples.title = Examples
+qhp.QtCore.subprojects.examples.indexTitle = Qt Core Examples
+qhp.QtCore.subprojects.examples.selectors = example
+qhp.QtCore.subprojects.examples.sortPages = true
+
 tagfile                 = ../../../doc/qtcore/qtcore.tags
 
 # Make QtCore depend on all doc modules; this ensures complete inheritance
diff --git a/src/corelib/doc/src/qtcore.qdoc b/src/corelib/doc/src/qtcore.qdoc
index ec5fa564639..fbcd02aeea5 100644
--- a/src/corelib/doc/src/qtcore.qdoc
+++ b/src/corelib/doc/src/qtcore.qdoc
@@ -31,3 +31,12 @@
     target_link_libraries(mytarget PRIVATE Qt6::CorePrivate)
     \endcode
 */
+
+/*!
+    \group corelib_examples
+    \title Qt Core Examples
+
+    \brief Examples for the Qt Core.
+
+    To learn how to use features of the Qt Core module, see examples:
+*/
diff --git a/src/corelib/kernel/qmetacontainer.cpp b/src/corelib/kernel/qmetacontainer.cpp
index 4b4ea06d8b9..6173198a972 100644
--- a/src/corelib/kernel/qmetacontainer.cpp
+++ b/src/corelib/kernel/qmetacontainer.cpp
@@ -210,7 +210,7 @@ void QMetaContainer::destroyIterator(const void *iterator) const
  */
 bool QMetaContainer::compareIterator(const void *i, const void *j) const
 {
-    return hasIterator() ? d_ptr->compareIteratorFn(i, j) : false;
+    return i == j || (hasIterator() && d_ptr->compareIteratorFn(i, j));
 }
 
 /*!
@@ -249,7 +249,7 @@ void QMetaContainer::advanceIterator(void *iterator, qsizetype step) const
  */
 qsizetype QMetaContainer::diffIterator(const void *i, const void *j) const
 {
-    return hasIterator() ? d_ptr->diffIteratorFn(i, j) : 0;
+    return (i != j && hasIterator()) ?  d_ptr->diffIteratorFn(i, j) : 0;
 }
 
 /*!
@@ -327,7 +327,7 @@ void QMetaContainer::destroyConstIterator(const void *iterator) const
  */
 bool QMetaContainer::compareConstIterator(const void *i, const void *j) const
 {
-    return hasConstIterator() ? d_ptr->compareConstIteratorFn(i, j) : false;
+    return i == j || (hasConstIterator() && d_ptr->compareConstIteratorFn(i, j));
 }
 
 /*!
@@ -366,7 +366,7 @@ void QMetaContainer::advanceConstIterator(void *iterator, qsizetype step) const
  */
 qsizetype QMetaContainer::diffConstIterator(const void *i, const void *j) const
 {
-    return hasConstIterator() ?  d_ptr->diffConstIteratorFn(i, j) : 0;
+    return (i != j && hasConstIterator()) ?  d_ptr->diffConstIteratorFn(i, j) : 0;
 }
 
 QT_END_NAMESPACE