From 5f8416ec659b134db90df7e7f857db77fd27b6ab Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Thu, 29 Aug 2013 09:28:44 +0200 Subject: 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 Reviewed-by: Giuseppe D'Angelo --- src/corelib/tools/qscopedpointer.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/corelib/tools/qscopedpointer.cpp') 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 &&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() -- cgit v1.2.3