2 files changed, 29 insertions, 8 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 57089f164b2..d2b2aa1cebb 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -2852,9 +2852,14 @@ const void *QtPrivate::QVariantTypeCoercer::coerce(const QVariant &value, const
     return converted.constData();
 }
 
+#if QT_DEPRECATED_SINCE(6, 13)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
+
 /*!
     \class QVariantRef
     \since 6.0
+    \deprecated [6.13] Use QVariant::Reference instead.
     \inmodule QtCore
     \brief The QVariantRef acts as a non-const reference to a QVariant.
 
@@ -2909,6 +2914,7 @@ const void *QtPrivate::QVariantTypeCoercer::coerce(const QVariant &value, const
 /*!
     \class QVariantConstPointer
     \since 6.0
+    \deprecated [6.13] Use QVariant::ConstPointer instead.
     \inmodule QtCore
     \brief Emulated const pointer to QVariant based on a pointer.
 
@@ -2946,6 +2952,7 @@ const QVariant *QVariantConstPointer::operator->() const
 /*!
     \class QVariantPointer
     \since 6.0
+    \deprecated [6.13] Use QVariant::Pointer instead.
     \inmodule QtCore
     \brief QVariantPointer is a template class that emulates a pointer to QVariant based on a pointer.
 
@@ -2974,6 +2981,9 @@ const QVariant *QVariantConstPointer::operator->() const
     implement operator->().
  */
 
+QT_WARNING_POP
+#endif // QT_DEPRECATED_SINCE(6, 13)
+
 /*!
     \class QVariant::ConstReference
     \since 6.11
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index 9117c827afe..47fb34cbe65 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -983,8 +983,13 @@ private:
 };
 }
 
-template<typename Pointer>
-class QVariantRef
+#if QT_DEPRECATED_SINCE(6, 13)
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
+
+template<typename Pointer> class
+QT_DEPRECATED_VERSION_X_6_13("Use QVariant::Reference instead.")
+QVariantRef
 {
 private:
     const Pointer *m_pointer = nullptr;
@@ -1008,20 +1013,23 @@ public:
     }
 };
 
-class Q_CORE_EXPORT QVariantConstPointer
+class
+QT_DEPRECATED_VERSION_X_6_13("Use QVariant::ConstPointer instead.")
+QVariantConstPointer
 {
 private:
     QVariant m_variant;
 
 public:
-    explicit QVariantConstPointer(QVariant variant);
+    Q_CORE_EXPORT explicit QVariantConstPointer(QVariant variant);
 
-    QVariant operator*() const;
-    const QVariant *operator->() const;
+    Q_CORE_EXPORT QVariant operator*() const;
+    Q_CORE_EXPORT const QVariant *operator->() const;
 };
 
-template<typename Pointer>
-class QVariantPointer
+template<typename Pointer> class
+QT_DEPRECATED_VERSION_X_6_13("Use QVariant::Pointer instead.")
+QVariantPointer
 {
 private:
     const Pointer *m_pointer = nullptr;
@@ -1032,6 +1040,9 @@ public:
     Pointer operator->() const { return *m_pointer; }
 };
 
+QT_WARNING_POP
+#endif // QT_DEPRECATED_SINCE(6, 13)
+
 QT_END_NAMESPACE
 
 #endif // QVARIANT_H