diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-02-10 10:57:43 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-13 15:15:56 +0100 |
| commit | cc7239da8d1ab95e68e12a64df3ca3051419cb34 (patch) | |
| tree | b2bfc4ac5a8fd24b2bb6852d36469ce95922b8c0 /src/corelib/tools/qsharedpointer_impl.h | |
| parent | 60cde0bd1496c528153d21769dfbcb2b0a9ffc91 (diff) | |
Make it possible to use QPointer<const T>
This is possible with QWeakPointer, so allow it for migrating
code too.
In the process, replace the QPointerBase with a member variable for
simplicity. The functionality of the QPointerBase is replaced
by a TypeSelector template.
Change-Id: I3b4c77bdeda2b863cc33e84a3da8a25bae928c8c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/tools/qsharedpointer_impl.h')
| -rw-r--r-- | src/corelib/tools/qsharedpointer_impl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index f6ef7cd55d..3121bcdf40 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -639,7 +639,7 @@ private: public: #else template <class X> friend class QSharedPointer; - friend class QPointerBase; + template <class X> friend class QPointer; #endif template <class X> |