summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qobjectdefs.h
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2012-04-12 22:46:01 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-13 18:15:26 +0200
commit5a8c13a7d4420cabf0fadbed6f8cae07162a32d8 (patch)
tree817448a47cc7cfabcbb55960520300a457498638 /src/corelib/kernel/qobjectdefs.h
parent84caba25d8cc0b7a050abc4d60393fbb3ec73391 (diff)
doc: Fix QObject::connect documentation
Unfortunately, qdoc is too simple to understand any pointer to member function syntax. (the ::* token is not even tokenized. And even if it was, it would be a difficult way to hack that into the parser. (there is already an ugly workaround for non-member pointer to function hat works by having '(*' as a token,but the same hack is not possible for pointer to member function)) So I just put verbatim 'PointerToMemberFunction' Also remove the obsolete mention that Qt::UniqueConnection is not supported in that overload. It is now. (And it even contradicts the previous paragraph) Change-Id: I8fc9544808c9a462b0f11ccea406e2e33dee15b1 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qobjectdefs.h')
-rw-r--r--src/corelib/kernel/qobjectdefs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h
index 5588724d4c..d391fb94ce 100644
--- a/src/corelib/kernel/qobjectdefs.h
+++ b/src/corelib/kernel/qobjectdefs.h
@@ -462,7 +462,7 @@ public:
Connection();
Connection(const Connection &other);
Connection &operator=(const Connection &other);
-#ifdef qdoc
+#ifdef Q_QDOC
operator bool() const;
#else
typedef void *Connection::*RestrictedBool;