1 files changed, 12 insertions, 49 deletions
diff --git a/src/corelib/kernel/qmetasequence.h b/src/corelib/kernel/qmetasequence.h
index e9505054159..26156e7924f 100644
--- a/src/corelib/kernel/qmetasequence.h
+++ b/src/corelib/kernel/qmetasequence.h
@@ -24,8 +24,8 @@ public:
     using reference = QVariant::Reference<SequentialIterator>;
     using pointer = QVariant::Pointer<SequentialIterator>;
 
-    static constexpr bool canNoexceptAssignQVariant = false;
-    static constexpr bool canNoexceptConvertToQVariant = false;
+    static constexpr bool CanNoexceptAssignQVariant = false;
+    static constexpr bool CanNoexceptConvertToQVariant = false;
 
     SequentialIterator(QIterator &&it) : QIterator(std::move(it)) {}
 
@@ -41,7 +41,7 @@ public:
     using reference = QVariant::ConstReference<SequentialConstIterator>;
     using pointer = QVariant::ConstPointer<SequentialConstIterator>;
 
-    static constexpr bool canNoexceptConvertToQVariant = false;
+    static constexpr bool CanNoexceptConvertToQVariant = false;
 
     SequentialConstIterator(QConstIterator &&it) : QConstIterator(std::move(it)) {}
 
@@ -184,13 +184,15 @@ public:
                 return;
             }
 
-            // ### Qt7: Drop this code. We shouldn't second-guess the underlying container
+#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0)
+            // We shouldn't second-guess the underlying container.
             QtPrivate::warnSynthesizedAccess(
                     "at() called on an iterable without native indexed accessors. This is slow");
             void *it = meta.constBegin(m_iterable.constPointer());
             meta.advanceConstIterator(it, idx);
             meta.valueAtConstIterator(it, dataPtr);
             meta.destroyConstIterator(it);
+#endif
         });
     }
 
@@ -204,13 +206,15 @@ public:
             return;
         }
 
-        // ### Qt7: Drop this code. We shouldn't second-guess the underlying container
+#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
     }
 
     void append(const QVariant &value)
@@ -248,55 +252,14 @@ public:
         Unspecified, AtBegin, AtEnd
     };
 
-    QT_DEPRECATED_VERSION_X_6_11("Use append() or prepend() instead.")
     void addValue(const QVariant &value, Position position = Unspecified)
-    {
-        const QMetaSequence meta = metaContainer();
-        QtPrivate::QVariantTypeCoercer coercer;
-        const void *valuePtr = coercer.coerce(value, meta.valueMetaType());
-
-        switch (position) {
-        case AtBegin:
-            if (meta.canAddValueAtBegin())
-                meta.addValueAtBegin(mutableIterable(), valuePtr);
-            break;
-        case AtEnd:
-            if (meta.canAddValueAtEnd())
-                meta.addValueAtEnd(mutableIterable(), valuePtr);
-            break;
-        case Unspecified:
-            if (meta.canAddValue())
-                meta.addValue(mutableIterable(), valuePtr);
-            break;
-        }
-    }
+            Q_DECL_EQ_DELETE_X("Use append() or prepend() instead.");
 
-    QT_DEPRECATED_VERSION_X_6_11("Use removeLast() or removeFirst() instead.")
     void removeValue(Position position = Unspecified)
-    {
-        const QMetaSequence meta = metaContainer();
+            Q_DECL_EQ_DELETE_X("Use removeLast() or removeFirst() instead.");
 
-        switch (position) {
-        case AtBegin:
-            if (meta.canRemoveValueAtBegin())
-                meta.removeValueAtBegin(mutableIterable());
-            break;
-        case AtEnd:
-            if (meta.canRemoveValueAtEnd())
-                meta.removeValueAtEnd(mutableIterable());
-            break;
-        case Unspecified:
-            if (meta.canRemoveValue())
-                meta.removeValue(mutableIterable());
-            break;
-        }
-    }
-
-    QT_DEPRECATED_VERSION_X_6_11("Use QMetaSequence::valueMetaType() instead.")
     QMetaType valueMetaType() const
-    {
-        return metaContainer().valueMetaType();
-    }
+            Q_DECL_EQ_DELETE_X("Use QMetaSequence::valueMetaType() instead.");
 
     QT_WARNING_POP
 #endif // QT_DEPRECATED_SINCE(6, 11)