QESDP: deprecate QT_ENABLE_QEXPLICITLYSHAREDDATAPOINTER_STATICCAST

We've had this workaround since Qt 5.4. It's due time we get rid of it. This commit deprecates it, in preparation for removal. [ChangeLog][QtCore][QExplicitlySharedDataPointer] Support for QT_ENABLE_QEXPLICITLYSHAREDDATAPOINTER_STATICCAST has been deprecated, and will get removed in a future version of Qt. Change-Id: I3000ea606b37714542916e105ebd50871dc42935 Pick-to: 6.8 Reviewed-by: Volker Hilsheimer <[email protected]>
brad0 · Jun 11, 2024 · 0ed039f · 0ed039f
1 parent 0cd32e1
commit 0ed039f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/corelib/tools/qshareddata.cpp b/src/corelib/tools/qshareddata.cpp
@@ -589,6 +589,10 @@ QT_BEGIN_NAMESPACE
     \c{QT_ENABLE_QEXPLICITLYSHAREDDATAPOINTER_STATICCAST} macro, and
     therefore to allow old code (that relied on this feature) to
     compile without modifications.
+
+    \note Usage of the
+    \c{QT_ENABLE_QEXPLICITLYSHAREDDATAPOINTER_STATICCAST} macro is
+    deprecated. The macro will be removed in a future version of Qt.
 */
 
 /*! \fn template <class T> QExplicitlySharedDataPointer<T>& QExplicitlySharedDataPointer<T>::operator=(const QExplicitlySharedDataPointer<T>& o)

diff --git a/src/corelib/tools/qshareddata.h b/src/corelib/tools/qshareddata.h
@@ -162,7 +162,7 @@ class QExplicitlySharedDataPointer
     Q_NODISCARD_CTOR
     QExplicitlySharedDataPointer(const QExplicitlySharedDataPointer<X> &o) noexcept
 #ifdef QT_ENABLE_QEXPLICITLYSHAREDDATAPOINTER_STATICCAST
-        : d(static_cast<T *>(o.data()))
+        : d(warnIfQExplicitlySharedDataPointerStaticCastMacroDefined(), static_cast<T *>(o.data()))
 #else
         : d(o.data())
 #endif
@@ -213,6 +213,11 @@ class QExplicitlySharedDataPointer
 private:
     void detach_helper();
 
+#ifdef QT_ENABLE_QEXPLICITLYSHAREDDATAPOINTER_STATICCAST
+    [[deprecated("Usage of QT_ENABLE_QEXPLICITLYSHAREDDATAPOINTER_STATICCAST is deprecated.")]]
+    constexpr void warnIfQExplicitlySharedDataPointerStaticCastMacroDefined() {}
+#endif
+
     T *d;
 };