9 files changed, 74 insertions, 72 deletions
diff --git a/src/corelib/kernel/qcore_mac.mm b/src/corelib/kernel/qcore_mac.mm
index 687fc7e85fa..f5f1f4a8cb8 100644
--- a/src/corelib/kernel/qcore_mac.mm
+++ b/src/corelib/kernel/qcore_mac.mm
@@ -22,6 +22,10 @@
 #include <spawn.h>
 
 #include <qdebug.h>
+#include <qpoint.h>
+#include <qsize.h>
+#include <qrect.h>
+#include <qmargins.h>
 
 #include "qendian.h"
 #include "qhash.h"
@@ -222,6 +226,34 @@ QDebug operator<<(QDebug dbg, CFStringRef stringRef)
     return dbg;
 }
 
+QDebug operator<<(QDebug dbg, CGPoint point)
+{
+    dbg << QPointF::fromCGPoint(point);
+    return dbg;
+}
+
+QDebug operator<<(QDebug dbg, CGSize size)
+{
+    dbg << QSizeF::fromCGSize(size);
+    return dbg;
+}
+
+QDebug operator<<(QDebug dbg, CGRect rect)
+{
+    dbg << QRectF::fromCGRect(rect);
+    return dbg;
+}
+
+#if defined(Q_OS_MACOS)
+QDebug operator<<(QDebug dbg, NSEdgeInsets insets)
+#else
+QDebug operator<<(QDebug dbg, UIEdgeInsets insets)
+#endif
+{
+    dbg << QMargins(insets.left, insets.top, insets.right, insets.bottom);
+    return dbg;
+}
+
 // Prevents breaking the ODR in case we introduce support for more types
 // later on, and lets the user override our default QDebug operators.
 #define QT_DECLARE_WEAK_QDEBUG_OPERATOR_FOR_CF_TYPE(CFType) \
diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h
index 2c4b4c02c55..1e57ee01e1d 100644
--- a/src/corelib/kernel/qcore_mac_p.h
+++ b/src/corelib/kernel/qcore_mac_p.h
@@ -78,6 +78,15 @@ kern_return_t IOObjectRelease(io_object_t object);
 Q_FORWARD_DECLARE_OBJC_CLASS(NSObject);
 Q_FORWARD_DECLARE_OBJC_CLASS(NSString);
 
+struct CGPoint;
+struct CGSize;
+struct CGRect;
+#if defined(Q_OS_MACOS)
+struct NSEdgeInsets;
+#else
+struct UIEdgeInsets;
+#endif
+
 // @compatibility_alias doesn't work with categories or their methods
 #define QtExtras QT_MANGLE_NAMESPACE(QtExtras)
 
@@ -225,6 +234,14 @@ Q_AUTOTEST_EXPORT void qt_mac_ensureResponsible();
 #ifndef QT_NO_DEBUG_STREAM
 Q_CORE_EXPORT QDebug operator<<(QDebug debug, const QMacAutoReleasePool *pool);
 Q_CORE_EXPORT QDebug operator<<(QDebug debug, const QCFString &string);
+Q_CORE_EXPORT QDebug operator<<(QDebug, CGPoint);
+Q_CORE_EXPORT QDebug operator<<(QDebug, CGSize);
+Q_CORE_EXPORT QDebug operator<<(QDebug, CGRect);
+#if defined(Q_OS_MACOS)
+Q_CORE_EXPORT QDebug operator<<(QDebug, NSEdgeInsets);
+#else
+Q_CORE_EXPORT QDebug operator<<(QDebug, UIEdgeInsets);
+#endif
 #endif
 
 Q_CORE_EXPORT bool qt_apple_isApplicationExtension();
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/qmetacontainer.h b/src/corelib/kernel/qmetacontainer.h
index c9d3a6bf9c6..66047afefd4 100644
--- a/src/corelib/kernel/qmetacontainer.h
+++ b/src/corelib/kernel/qmetacontainer.h
@@ -971,18 +971,11 @@ public:
         Iterator mutableEnd();
 
         QVariant at(qsizetype idx) const;
-        void set(qsizetype idx, const QVariant &value);
+        void setAt(qsizetype idx, const QVariant &value);
         void append(const QVariant &value);
         void prepend(const QVariant &value);
         void removeLast();
         void removeFirst();
-
-#if QT_DEPRECATED_SINCE(6, 11)
-        enum Position: quint8 { Unspecified, AtBegin, AtEnd };
-        void addValue(const QVariant &value, Position position = Unspecified);
-        void removeValue(Position position = Unspecified);
-        QMetaType valueMetaType() const;
-#endif // QT_DEPRECATED_SINCE(6, 11)
     };
 #else
     using Iterable = QtMetaContainerPrivate::Sequence;
diff --git a/src/corelib/kernel/qmetasequence.cpp b/src/corelib/kernel/qmetasequence.cpp
index 2a3a923d5ca..018dd610146 100644
--- a/src/corelib/kernel/qmetasequence.cpp
+++ b/src/corelib/kernel/qmetasequence.cpp
@@ -531,39 +531,6 @@ void QMetaSequence::valueAtConstIterator(const void *iterator, void *result) con
 */
 
 /*!
-    \enum QMetaSequence::Iterable::Position
-    \deprecated [6.11] Use append(), prepend(), removeFirst(), or removeLast()
-
-    Specifies the position at which an element shall be added to or removed from
-    the iterable.
-
-    \value AtBegin
-        Add or remove at the beginning of the iterable.
-    \value AtEnd
-        Add or remove at the end of the iterable.
-    \value Unspecified
-        Add or remove at an unspecified position in the iterable.
- */
-
-/*!
-    \fn void QMetaSequence::Iterable::addValue(const QVariant &value, Position position)
-    \deprecated [6.11] Use append() or prepend()
-    Adds \a value to the container, at \a position, if possible.
- */
-
-/*!
-    \deprecated [6.11] Use removeFirst() or removeLast()
-    \fn void QMetaSequence::Iterable::removeValue(Position position)
-    Removes a value from the container, at \a position, if possible.
- */
-
-/*!
-    \deprecated [6.11] Use QMetaSequence::valueMetaType()
-    \fn QMetaType QMetaSequence::Iterable::valueMetaType() const
-    Returns the meta type for values stored in the underlying container.
- */
-
-/*!
     \fn QVariant QMetaSequence::Iterable::at(qsizetype idx) const
     Returns the value at position \a idx in the container.
 
@@ -574,13 +541,8 @@ void QMetaSequence::valueAtConstIterator(const void *iterator, void *result) con
 */
 
 /*!
-    \fn void QMetaSequence::Iterable::set(qsizetype idx, const QVariant &value)
+    \fn void QMetaSequence::Iterable::setAt(qsizetype idx, const QVariant &value)
     Sets the element at position \a idx in the container to \a value.
-
-    \note If the underlying container does not provide a native way to assign
-          an element at an index, this method will synthesize the assignment
-          using iterators. This behavior is deprecated and will be removed in a
-          future version of Qt.
 */
 
 /*!
diff --git a/src/corelib/kernel/qmetasequence.h b/src/corelib/kernel/qmetasequence.h
index 26156e7924f..f8052476d79 100644
--- a/src/corelib/kernel/qmetasequence.h
+++ b/src/corelib/kernel/qmetasequence.h
@@ -196,25 +196,11 @@ public:
         });
     }
 
-    void set(qsizetype idx, const QVariant &value)
+    void setAt(qsizetype idx, const QVariant &value)
     {
         const QMetaSequence meta = metaContainer();
         QtPrivate::QVariantTypeCoercer coercer;
-        const void *dataPtr = coercer.coerce(value, meta.valueMetaType());
-        if (meta.canSetValueAtIndex()) {
-            meta.setValueAtIndex(mutableIterable(), idx, dataPtr);
-            return;
-        }
-
-#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0)
-        // We shouldn't second-guess the underlying container
-        QtPrivate::warnSynthesizedAccess(
-                "set() called on an iterable without native indexed accessors. This is slow");
-        void *it = meta.begin(m_iterable.mutablePointer());
-        meta.advanceIterator(it, idx);
-        meta.setValueAtIterator(it, dataPtr);
-        meta.destroyIterator(it);
-#endif
+        meta.setValueAtIndex(mutableIterable(), idx, coercer.coerce(value, meta.valueMetaType()));
     }
 
     void append(const QVariant &value)
@@ -261,6 +247,9 @@ public:
     QMetaType valueMetaType() const
             Q_DECL_EQ_DELETE_X("Use QMetaSequence::valueMetaType() instead.");
 
+    void set(qsizetype idx, const QVariant &value)
+            Q_DECL_EQ_DELETE_X("Use setAt() instead.");
+
     QT_WARNING_POP
 #endif // QT_DEPRECATED_SINCE(6, 11)
 };
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}
 */
 
 /*!