diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qpointer.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/kernel/qpointer.h | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/corelib/kernel/qpointer.cpp b/src/corelib/kernel/qpointer.cpp index b983bef5fe..f81451d906 100644 --- a/src/corelib/kernel/qpointer.cpp +++ b/src/corelib/kernel/qpointer.cpp @@ -44,7 +44,6 @@ \brief The QPointer class is a template class that provides guarded pointers to QObject. \ingroup objectmodel - \obsolete Use QWeakPointer instead. A guarded pointer, QPointer<T>, behaves like a normal C++ pointer \c{T *}, except that it is automatically set to 0 when the diff --git a/src/corelib/kernel/qpointer.h b/src/corelib/kernel/qpointer.h index 9b4f8e4332..836c13e3fc 100644 --- a/src/corelib/kernel/qpointer.h +++ b/src/corelib/kernel/qpointer.h @@ -49,10 +49,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#if QT_DEPRECATED_SINCE(5,0) - template <class T> -class QT_DEPRECATED QPointer +class QPointer { QWeakPointer<T> wp; @@ -161,8 +159,6 @@ inline bool operator!= (int i, const QPointer<T> &p) { Q_ASSERT(i == 0); return !i && !p.isNull(); } #endif -#endif // QT_DEPRECATED_SINCE(5,0) - QT_END_NAMESPACE QT_END_HEADER |