From e3a8e242ada146b1ec796424696e6c3964ab36dc Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Sun, 9 Mar 2014 11:46:26 +0100
Subject: QWeakPointer: add lock() for std::weak_ptr compatibility

[ChangeLog][QtCore][QWeakPointer] Added lock() method for std::weak_ptr compatibility.

Change-Id: I0851d91c51f5a4f04a855a1d8082234ce38396b4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/tools/qsharedpointer.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/corelib/tools/qsharedpointer.cpp')

diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp
index a610fc46e5..19c88fcf1c 100644
--- a/src/corelib/tools/qsharedpointer.cpp
+++ b/src/corelib/tools/qsharedpointer.cpp
@@ -893,6 +893,15 @@
     \sa QSharedPointer::QSharedPointer()
 */
 
+/*!
+    \fn QSharedPointer<T> QWeakPointer::lock() const
+    \since 5.4
+
+    Same as toStrongRef().
+
+    This function is provided for API compatibility with std::weak_ptr.
+*/
+
 /*!
     \fn void QWeakPointer::clear()
 
-- 
cgit v1.2.3