Deprecate the use of QWeakPointer to track QObjects.

The main problem with using QWeakPointer to track QObjects is that it
has API to convert to QSharedPointer, which is undefined behavior. There
is no need to overload the meaning of QWeakPointer with QObject
tracking.

QPointer is more suitable and should be used instead. Because QPointer
is implemented in terms of QWeakPointer, we need to add some overloads
which are not deprecated.

Change-Id: If0333e4800c9fd277629cc69185c9ca3e4e7e81d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 18 insertions, 2 deletions

diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
index 4a9327fe81..d1d660dfc7 100644
--- a/src/corelib/tools/qsharedpointer_impl.h
+++ b/src/corelib/tools/qsharedpointer_impl.h
@@ -585,13 +585,18 @@ public:
 
 #ifndef QT_NO_QOBJECT
     // special constructor that is enabled only if X derives from QObject
+#if QT_DEPRECATED_SINCE(5, 0)
     template <class X>
-    inline QWeakPointer(X *ptr) : d(ptr ? d->getAndRef(ptr) : 0), value(ptr)
+    QT_DEPRECATED inline QWeakPointer(X *ptr) : d(ptr ? d->getAndRef(ptr) : 0), value(ptr)
     { }
 #endif
+#endif
+
+#if QT_DEPRECATED_SINCE(5, 0)
     template <class X>
-    inline QWeakPointer &operator=(X *ptr)
+    QT_DEPRECATED inline QWeakPointer &operator=(X *ptr)
     { return *this = QWeakPointer(ptr); }
+#endif
 
     inline QWeakPointer(const QWeakPointer<T> &o) : d(o.d), value(o.value)
     { if (d) d->weakref.ref(); }
@@ -664,6 +669,17 @@ private:
 public:
 #else
     template <class X> friend class QSharedPointer;
+    friend class QPointerBase;
+#endif
+
+    template <class X>
+    inline QWeakPointer &assign(X *ptr)
+    { return *this = QWeakPointer<X>(ptr, true); }
+
+#ifndef QT_NO_QOBJECT
+    template <class X>
+    inline QWeakPointer(X *ptr, bool) : d(ptr ? d->getAndRef(ptr) : 0), value(ptr)
+    { }
 #endif
 
     inline void internalSet(Data *o, T *actual)