summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qscopedpointer.cpp
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2013-08-29 09:28:44 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-30 09:22:25 +0200
commit5f8416ec659b134db90df7e7f857db77fd27b6ab (patch)
treec2f2e08dc03930c51c6dbade21c7c3f5600d1caa /src/corelib/tools/qscopedpointer.cpp
parent00237744117bd9ca5ce13cafa21203fe4decd8d9 (diff)
Doc: Enable documentation for QScopedPointer's rvalue ref functions
Make the documented QScopedPointer functions that take rvalue references visible in the documentation. Task-number: QTBUG-32675 Change-Id: If65af91d9379a6c0486e43c33434cca8505fc5c3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/corelib/tools/qscopedpointer.cpp')
-rw-r--r--src/corelib/tools/qscopedpointer.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp
index 047fcbfc30..22155d6d3a 100644
--- a/src/corelib/tools/qscopedpointer.cpp
+++ b/src/corelib/tools/qscopedpointer.cpp
@@ -133,7 +133,6 @@ QT_BEGIN_NAMESPACE
Constructs this QScopedPointer instance and sets its pointer to \a p.
*/
-#ifndef Q_QDOC // QTBUG-32675, qdoc can't parse rvalue refs
/*!
\fn QScopedPointer::QScopedPointer(QScopedPointer<T, Cleanup> &&other)
@@ -154,11 +153,10 @@ QT_BEGIN_NAMESPACE
Otherwise, this instance is set to point to the object \a other
is pointing to, and \a other is set to point to \c{NULL}.
- If this instance was pointing to an object, that object is destroyed,
+ If this instance was pointing to an object, that object is destroyed.
\since 5.2
*/
-#endif
/*!
\fn QScopedPointer::~QScopedPointer()