3 files changed, 7 insertions, 63 deletions
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)
 };