summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/corelib/kernel/qpointer.cpp7
-rw-r--r--src/corelib/kernel/qpointer.h2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/corelib/kernel/qpointer.cpp b/src/corelib/kernel/qpointer.cpp
index 068314633b..5f6826b269 100644
--- a/src/corelib/kernel/qpointer.cpp
+++ b/src/corelib/kernel/qpointer.cpp
@@ -156,6 +156,13 @@
*/
/*!
+ \fn template <class T> T* QPointer<T>::get() const
+ \since 6.0
+
+ Same as data(). This function is provided for STL compatibility.
+*/
+
+/*!
\fn template <class T> bool QPointer<T>::isNull() const
Returns \c true if the referenced object has been destroyed or if
diff --git a/src/corelib/kernel/qpointer.h b/src/corelib/kernel/qpointer.h
index 5efdb0b395..769ace5a71 100644
--- a/src/corelib/kernel/qpointer.h
+++ b/src/corelib/kernel/qpointer.h
@@ -75,6 +75,8 @@ public:
inline T* data() const
{ return static_cast<T*>(wp.internalData()); }
+ inline T* get() const
+ { return data(); }
inline T* operator->() const
{ return data(); }
inline T& operator*() const