diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2025-12-03 18:57:58 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2025-12-04 14:29:19 +0100 |
| commit | fe298562cfa334dfc38d77284b543da05bec3c70 (patch) | |
| tree | b2b3ab179f26e0640bbdc9167684e7536aa7655b | |
| parent | d8847378814710c3b8b9deb28fea81f959798b0b (diff) | |
Core: Deprecate QVariant{Ref|ConstPointer|Pointer} only in 6.15
Amends commit 9dec893bf64f36fa339a1226a77bf938c5603587
Task-number: QTBUG-140181
Change-Id: If2fdb72b901ef7c577e7a46266f35c749a6958cb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 10 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant.h | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index d2b2aa1cebb..7cad20e9fd4 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -2852,14 +2852,14 @@ const void *QtPrivate::QVariantTypeCoercer::coerce(const QVariant &value, const return converted.constData(); } -#if QT_DEPRECATED_SINCE(6, 13) +#if QT_DEPRECATED_SINCE(6, 15) QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED /*! \class QVariantRef \since 6.0 - \deprecated [6.13] Use QVariant::Reference instead. + \deprecated [6.15] Use QVariant::Reference instead. \inmodule QtCore \brief The QVariantRef acts as a non-const reference to a QVariant. @@ -2914,7 +2914,7 @@ QT_WARNING_DISABLE_DEPRECATED /*! \class QVariantConstPointer \since 6.0 - \deprecated [6.13] Use QVariant::ConstPointer instead. + \deprecated [6.15] Use QVariant::ConstPointer instead. \inmodule QtCore \brief Emulated const pointer to QVariant based on a pointer. @@ -2952,7 +2952,7 @@ const QVariant *QVariantConstPointer::operator->() const /*! \class QVariantPointer \since 6.0 - \deprecated [6.13] Use QVariant::Pointer instead. + \deprecated [6.15] Use QVariant::Pointer instead. \inmodule QtCore \brief QVariantPointer is a template class that emulates a pointer to QVariant based on a pointer. @@ -2982,7 +2982,7 @@ const QVariant *QVariantConstPointer::operator->() const */ QT_WARNING_POP -#endif // QT_DEPRECATED_SINCE(6, 13) +#endif // QT_DEPRECATED_SINCE(6, 15) /*! \class QVariant::ConstReference diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 47fb34cbe65..82eec0693d6 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -983,12 +983,12 @@ private: }; } -#if QT_DEPRECATED_SINCE(6, 13) +#if QT_DEPRECATED_SINCE(6, 15) QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED template<typename Pointer> class -QT_DEPRECATED_VERSION_X_6_13("Use QVariant::Reference instead.") +QT_DEPRECATED_VERSION_X_6_15("Use QVariant::Reference instead.") QVariantRef { private: @@ -1014,7 +1014,7 @@ public: }; class -QT_DEPRECATED_VERSION_X_6_13("Use QVariant::ConstPointer instead.") +QT_DEPRECATED_VERSION_X_6_15("Use QVariant::ConstPointer instead.") QVariantConstPointer { private: @@ -1028,7 +1028,7 @@ public: }; template<typename Pointer> class -QT_DEPRECATED_VERSION_X_6_13("Use QVariant::Pointer instead.") +QT_DEPRECATED_VERSION_X_6_15("Use QVariant::Pointer instead.") QVariantPointer { private: @@ -1041,7 +1041,7 @@ public: }; QT_WARNING_POP -#endif // QT_DEPRECATED_SINCE(6, 13) +#endif // QT_DEPRECATED_SINCE(6, 15) QT_END_NAMESPACE |