summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2016-03-09 20:37:17 +0100
committerOlivier Goffart (Woboq GmbH) <ogoffart@woboq.com>2016-03-29 14:11:05 +0000
commit7d9cbc6b643b472304960842cd60ec4ba3319f37 (patch)
tree04cede6285e0663ac13267669439ab93a537e5e0 /src/corelib/tools
parent09a1dd2fd4d76a7a7af64cc147b68fda50c17353 (diff)
Fix Q_QDOC code for PointerToMemberFunction
In functions such as QObject::connect and similar which are using pointer to member function or functor, we have a different declaration for qdoc because we don't want to show the QEnableIf and other type traits in the doc. However, The code still needs to be valid, as we will use clang to parse the documentation. Fix it by making 'PointerToMemberFunction' and 'Functor' template parameters (which they actually are). Change-Id: Ie2648407bae21ba6d1677f6de2d6f597486b5c98 Reviewed-by: Edward Welbourne <edward.welbourne@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
Diffstat (limited to 'src/corelib/tools')
-rw-r--r--src/corelib/tools/qsharedpointer.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/tools/qsharedpointer.h b/src/corelib/tools/qsharedpointer.h
index 901862e7a2..6742a66939 100644
--- a/src/corelib/tools/qsharedpointer.h
+++ b/src/corelib/tools/qsharedpointer.h
@@ -68,6 +68,7 @@ public:
// constructors
QSharedPointer();
explicit QSharedPointer(T *ptr);
+ template<typename Deleter>
QSharedPointer(T *ptr, Deleter d);
QSharedPointer(const QSharedPointer<T> &other);
QSharedPointer(const QWeakPointer<T> &other);