From b8773165d76e0d5d46287d92f9d6bdbbd2110180 Mon Sep 17 00:00:00 2001
From: Robin Burchell <robin+qt@viroteck.net>
Date: Thu, 15 Mar 2012 20:11:04 +0100
Subject: Un-deprecate QPointer per mailing list discussion.

Now that QPointer is implemented in an efficient manner, there is really no need
to avoid it, deprecating it just adds a large amount of churn.

Change-Id: I32116faf14c3b07631d59ba9585f9ce422531646
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
---
 src/corelib/kernel/qpointer.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/corelib/kernel/qpointer.h')

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
-- 
cgit v1.2.3