19 files changed, 51 insertions, 29 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp
index c3e1ba4010f..8a343b15eeb 100644
--- a/src/corelib/animation/qabstractanimation.cpp
+++ b/src/corelib/animation/qabstractanimation.cpp
@@ -858,6 +858,7 @@ qint64 QAnimationDriver::elapsed() const
  */
 
 /*!
+   \internal
    The default animation driver just spins the timer...
  */
 QDefaultAnimationDriver::QDefaultAnimationDriver(QUnifiedTimer *timer)
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake
index 4386b907c13..90a0e359c9f 100644
--- a/src/corelib/configure.cmake
+++ b/src/corelib/configure.cmake
@@ -1278,7 +1278,6 @@ qt_feature("permissions" PUBLIC
 )
 qt_feature("openssl-hash" PRIVATE
     LABEL "OpenSSL based cryptographic hash"
-    AUTODETECT OFF
     CONDITION QT_FEATURE_openssl_linked AND QT_FEATURE_opensslv30
     PURPOSE "Uses OpenSSL based implementation of cryptographic hash algorithms."
 )
diff --git a/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc b/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc
index 42cb3ecb42b..b8e5e038a33 100644
--- a/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc
+++ b/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc
@@ -142,6 +142,10 @@ effectively disables release package signing even in Release or RelWithDebInfo
 builds. When not set, the default behavior is to use release package signing in
 build types other than Debug.
 
+This variable is not supposed to be set in CMake project files. Rather set it
+when configuring your project on the command line or in the CMake settings of
+your IDE.
+
 \sa {androiddeployqt}
 */
 
diff --git a/src/corelib/doc/src/external-resources.qdoc b/src/corelib/doc/src/external-resources.qdoc
index 2232b49bf23..5d357c65496 100644
--- a/src/corelib/doc/src/external-resources.qdoc
+++ b/src/corelib/doc/src/external-resources.qdoc
@@ -28,11 +28,6 @@
 */
 
 /*!
-    \externalpage https://marcmutz.wordpress.com/effective-qt/containers/#containers-qlist
-    \title Pros and Cons of Using QList
-*/
-
-/*!
     \externalpage https://marcmutz.wordpress.com/effective-qt/containers/
     \title Understand the Qt Containers
 */
diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp
index 0771c15584b..d3c398f0860 100644
--- a/src/corelib/io/qfsfileengine.cpp
+++ b/src/corelib/io/qfsfileengine.cpp
@@ -249,6 +249,12 @@ bool QFSFileEngine::open(QIODevice::OpenMode openMode, FILE *fh, QFile::FileHand
 }
 
 /*!
+    \class QFSFileEnginePrivate
+    \inmodule QtCore
+    \internal
+*/
+
+/*!
     Opens the file handle \a fh using the open mode \a flags.
 */
 bool QFSFileEnginePrivate::openFh(QIODevice::OpenMode openMode, FILE *fh)
diff --git a/src/corelib/io/qwindowspipereader.cpp b/src/corelib/io/qwindowspipereader.cpp
index 456a209af37..6edf4395887 100644
--- a/src/corelib/io/qwindowspipereader.cpp
+++ b/src/corelib/io/qwindowspipereader.cpp
@@ -14,6 +14,11 @@ using namespace Qt::StringLiterals;
 
 static const DWORD minReadBufferSize = 4096;
 
+/*!
+    \class QWindowsPipeReader
+    \inmodule QtCore
+    \internal
+*/
 QWindowsPipeReader::QWindowsPipeReader(QObject *parent)
     : QObject(parent),
       handle(INVALID_HANDLE_VALUE),
diff --git a/src/corelib/kernel/qeventdispatcher_cf.mm b/src/corelib/kernel/qeventdispatcher_cf.mm
index 2dddf147f85..d57c057a21a 100644
--- a/src/corelib/kernel/qeventdispatcher_cf.mm
+++ b/src/corelib/kernel/qeventdispatcher_cf.mm
@@ -207,6 +207,7 @@ QEventLoop *QEventDispatcherCoreFoundation::currentEventLoop() const
 }
 
 /*!
+    \internal
     Processes all pending events that match \a flags until there are no
     more events to process. Returns \c true if pending events were handled;
     otherwise returns \c false.
diff --git a/src/corelib/kernel/qpermissions.cpp b/src/corelib/kernel/qpermissions.cpp
index 6767917e176..69383dafdd9 100644
--- a/src/corelib/kernel/qpermissions.cpp
+++ b/src/corelib/kernel/qpermissions.cpp
@@ -119,7 +119,7 @@ Q_LOGGING_CATEGORY(lcPermissions, "qt.permissions", QtWarningMsg);
     To ensure the relevant permission backend is included with your
     application, please \l {QT_ANDROID_PACKAGE_SOURCE_DIR}
     {point the build system to your custom \c AndroidManifest.xml}
-    or use \l {qt_add_android_permission()}.
+    or use \l {qt_add_android_permission}().
 
     The relevant permission names are described in the documentation
     for each permission type.
diff --git a/src/corelib/kernel/qproperty.cpp b/src/corelib/kernel/qproperty.cpp
index d538ed7b4e9..9141a8f8bad 100644
--- a/src/corelib/kernel/qproperty.cpp
+++ b/src/corelib/kernel/qproperty.cpp
@@ -402,6 +402,16 @@ QPropertyBindingPrivate::NotificationState QPropertyBindingPrivate::notifyNonRec
 }
 
 /*!
+    \class QUntypedPropertyBinding
+    \inmodule QtCore
+    \since 6.0
+    \ingroup tools
+    \brief Represents a type-erased property binding.
+
+    \sa QUntypedBindable
+*/
+
+/*!
   Constructs a null QUntypedPropertyBinding.
 
   \sa isNull()
@@ -409,8 +419,8 @@ QPropertyBindingPrivate::NotificationState QPropertyBindingPrivate::notifyNonRec
 QUntypedPropertyBinding::QUntypedPropertyBinding() = default;
 
 /*!
-  \fn template<typename Functor>
-  QUntypedPropertyBinding(QMetaType metaType, Functor &&f, const QPropertyBindingSourceLocation &location)
+  \fn template<typename Functor> QUntypedPropertyBinding(
+        QMetaType metaType, Functor &&f, const QPropertyBindingSourceLocation &location)
 
   \internal
 */
@@ -448,7 +458,6 @@ QUntypedPropertyBinding::QUntypedPropertyBinding(const QUntypedPropertyBinding &
     : d(other.d)
 {
 }
-
 /*!
     Copy-assigns \a other to this QUntypedPropertyBinding.
 */
@@ -1183,7 +1192,7 @@ QString QPropertyBindingError::description() const
 
   \return \c true when the binding was successfully set.
 
-  //! \sa QUntypedPropertyBinding::valueMetaType()
+  \sa QUntypedPropertyBinding::valueMetaType()
 */
 
 /*!
@@ -1199,8 +1208,7 @@ QString QPropertyBindingError::description() const
   Returns the metatype of the property from which the QUntypedBindable was created.
   If the bindable is invalid, an invalid metatype will be returned.
 
-  \sa isValid()
-  //! \sa QUntypedPropertyBinding::valueMetaType()
+  \sa isValid(), QUntypedPropertyBinding::valueMetaType()
 */
 
 /*!
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index 9fdac89f775..6000edaa177 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -392,8 +392,8 @@ public:
     translation files may contain misleading or malicious translations.
 
     \sa QCoreApplication::installTranslator(), QCoreApplication::removeTranslator(),
-        QObject::tr(), QCoreApplication::translate(), {I18N Example},
-        {Hello tr() Example}, {Arrow Pad Example}, {Troll Print Example}
+        QObject::tr(), QCoreApplication::translate(),
+        {Localized Clock Example}, {Arrow Pad Example}, {Troll Print Example}
 */
 
 /*!
diff --git a/src/corelib/serialization/qcborvalue.cpp b/src/corelib/serialization/qcborvalue.cpp
index 13d74e591d5..0aeb2b07f47 100644
--- a/src/corelib/serialization/qcborvalue.cpp
+++ b/src/corelib/serialization/qcborvalue.cpp
@@ -975,6 +975,7 @@ QCborContainerPrivate *QCborContainerPrivate::detach(QCborContainerPrivate *d, q
 }
 
 /*!
+  \internal
   Prepare for an insertion at position \a index
 
   Detaches and ensures there are at least index entries in the array, padding
diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp
index ae3bed5b751..fd2f7faeee5 100644
--- a/src/corelib/serialization/qdatastream.cpp
+++ b/src/corelib/serialization/qdatastream.cpp
@@ -552,6 +552,7 @@ void QDataStream::setByteOrder(ByteOrder bo)
     \value Qt_6_9
     \value Qt_6_10
     \value Qt_6_11
+    \value Qt_6_12
     \omitvalue Qt_DefaultCompiledVersion
 
     \sa setVersion(), version()
diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h
index 04373fe9c8a..d6fcf17efcd 100644
--- a/src/corelib/serialization/qdatastream.h
+++ b/src/corelib/serialization/qdatastream.h
@@ -96,8 +96,9 @@ public:
         Qt_6_9 = Qt_6_7,
         Qt_6_10 = 23,
         Qt_6_11 = 24,
-        Qt_DefaultCompiledVersion = Qt_6_11
-#if QT_VERSION >= QT_VERSION_CHECK(6, 12, 0)
+        Qt_6_12 = Qt_6_11,
+        Qt_DefaultCompiledVersion = Qt_6_12
+#if QT_VERSION >= QT_VERSION_CHECK(6, 13, 0)
 #error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion
 #endif
     };
diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp
index 9cd90fa9d65..ff70289013a 100644
--- a/src/corelib/serialization/qxmlstream.cpp
+++ b/src/corelib/serialization/qxmlstream.cpp
@@ -3678,7 +3678,7 @@ void QXmlStreamWriter::setStopWritingOnError(bool stop)
     The error status is never reset. Writes happening after the error
     occurred may be ignored, even if the error condition is cleared.
 
-    \sa error(), errorString(), raiseError(const QString &message),
+    \sa error(), errorString(), raiseError()
  */
 bool QXmlStreamWriter::hasError() const
 {
@@ -3692,7 +3692,7 @@ bool QXmlStreamWriter::hasError() const
     QXmlStreamWriter::Error::None.
 
     \since 6.10
-    \sa errorString(), raiseError(const QString &message), hasError()
+    \sa errorString(), raiseError(), hasError()
  */
 QXmlStreamWriter::Error QXmlStreamWriter::error() const
 {
@@ -3708,7 +3708,7 @@ QXmlStreamWriter::Error QXmlStreamWriter::error() const
     a null string.
 
     \since 6.10
-    \sa error(), raiseError(const QString &message), hasError()
+    \sa error(), raiseError(), hasError()
  */
 QString QXmlStreamWriter::errorString() const
 {
diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp
index fed09aee45e..18007cacae6 100644
--- a/src/corelib/text/qlocale.cpp
+++ b/src/corelib/text/qlocale.cpp
@@ -301,6 +301,7 @@ bool operator<(LikelyPair lhs, LikelyPair rhs)
 } // anonymous namespace
 
 /*!
+    \internal
     Fill in blank fields of a locale ID.
 
     An ID in which some fields are zero stands for any locale that agrees with
diff --git a/src/corelib/text/qstringconverter.cpp b/src/corelib/text/qstringconverter.cpp
index bf6e776ee0e..896142b4837 100644
--- a/src/corelib/text/qstringconverter.cpp
+++ b/src/corelib/text/qstringconverter.cpp
@@ -2739,7 +2739,7 @@ QStringList QStringConverter::availableCodecs()
 
     May also provide data from residual content that was pending decoding.
     When there is no residual data to account for, the return's \c error
-    field will be set to \l {QCharConverter::FinalizeResult::Error::}
+    field will be set to \l {QStringConverter::FinalizeResultChar::error}
     {NoError}.
 
     If \a out is supplied and non-null, it must have space in which up to
@@ -2793,7 +2793,7 @@ auto QStringDecoder::finalize(char16_t *out, qsizetype maxlen) -> FinalizeResult
 
     May also provide data from residual content that was pending decoding.
     When there is no residual data to account for, the return's \c error
-    field will be set to \l {QCharConverter::FinalizeResult::Error::}
+    field will be set to \l {QStringConverter::FinalizeResultChar::error}
     {NoError}.
 
     If \a out is supplied and non-null, it must have space in which up to
diff --git a/src/corelib/thread/qreadwritelock.cpp b/src/corelib/thread/qreadwritelock.cpp
index 96e35dcb965..2a1af2315ca 100644
--- a/src/corelib/thread/qreadwritelock.cpp
+++ b/src/corelib/thread/qreadwritelock.cpp
@@ -234,14 +234,14 @@ QBasicReadWriteLock::contendedTryLockForRead(QDeadlineTimer timeout, void *dd)
             return d->recursiveLockForRead(timeout);
 
         auto lock = qt_unique_lock(d->mutex);
-        if (d != d_ptr.loadRelaxed()) {
+        if (QReadWriteLockPrivate *dd = d_ptr.loadAcquire(); d != dd) {
             // d_ptr has changed: this QReadWriteLock was unlocked before we had
             // time to lock d->mutex.
             // We are holding a lock to a mutex within a QReadWriteLockPrivate
             // that is already released (or even is already re-used). That's ok
             // because the QFreeList never frees them.
             // Just unlock d->mutex (at the end of the scope) and retry.
-            d = d_ptr.loadAcquire();
+            d = dd;
             continue;
         }
         return d->lockForRead(lock, timeout);
@@ -340,11 +340,11 @@ QBasicReadWriteLock::contendedTryLockForWrite(QDeadlineTimer timeout, void *dd)
             return d->recursiveLockForWrite(timeout);
 
         auto lock = qt_unique_lock(d->mutex);
-        if (d != d_ptr.loadRelaxed()) {
+        if (QReadWriteLockPrivate *dd = d_ptr.loadAcquire(); d != dd) {
             // The mutex was unlocked before we had time to lock the mutex.
             // We are holding to a mutex within a QReadWriteLockPrivate that is already released
             // (or even is already re-used) but that's ok because the QFreeList never frees them.
-            d = d_ptr.loadAcquire();
+            d = dd;
             continue;
         }
         return d->lockForWrite(lock, timeout);
diff --git a/src/corelib/time/qdatetimeparser.cpp b/src/corelib/time/qdatetimeparser.cpp
index 10882738a39..05ba3d2beae 100644
--- a/src/corelib/time/qdatetimeparser.cpp
+++ b/src/corelib/time/qdatetimeparser.cpp
@@ -2389,6 +2389,7 @@ bool operator==(QDateTimeParser::SectionNode s1, QDateTimeParser::SectionNode s2
 }
 
 /*!
+  \internal
   Sets \a cal as the calendar to use. The default is Gregorian.
 */
 
diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp
index de68a0042ac..ce35e8ccffe 100644
--- a/src/corelib/tools/qeasingcurve.cpp
+++ b/src/corelib/tools/qeasingcurve.cpp
@@ -332,8 +332,6 @@ struct TCBPoint
     qreal _c;
     qreal _b;
 
-    TCBPoint() {}
-    TCBPoint(QPointF point, qreal t, qreal c, qreal b) : _point(point), _t(t), _c(c), _b(b) {}
 
     bool operator==(const TCBPoint &other) const
     {
@@ -1381,7 +1379,7 @@ void QEasingCurve::addTCBSegment(const QPointF &nextPoint, qreal t, qreal c, qre
     if (!d_ptr->config)
         d_ptr->config = curveToFunctionObject(d_ptr->type);
 
-    d_ptr->config->_tcbPoints.append(TCBPoint(nextPoint, t, c, b));
+    d_ptr->config->_tcbPoints.append(TCBPoint{nextPoint, t, c, b});
 
     if (nextPoint == QPointF(1.0, 1.0)) {
         d_ptr->config->_bezierCurves = tcbToBezier(d_ptr->config->_tcbPoints);