summaryrefslogtreecommitdiffstats
path: root/src/tools/moc/moc.cpp
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-07-30 08:11:57 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-07-30 08:13:35 (GMT)
commit9523b27be4fe00870d19c4ff4caa2d78dcf520e6 (patch)
tree54a8dec77cf9f165072ebb48f9a74bbc78aa502e /src/tools/moc/moc.cpp
parentd09fa4a816c6b9ccf306b7e1a887c4a4b1dc2f4e (diff)
downloadQt-9523b27be4fe00870d19c4ff4caa2d78dcf520e6.zip
Qt-9523b27be4fe00870d19c4ff4caa2d78dcf520e6.tar.gz
Qt-9523b27be4fe00870d19c4ff4caa2d78dcf520e6.tar.bz2
parse Q_INVOKABLE explicit constructors
regression introduced in e43eae35 because the code of maybeParseFunction and parseFunction is not exactly the same. Reviewed-by: Kent Hansen
Diffstat (limited to 'src/tools/moc/moc.cpp')
-rw-r--r--src/tools/moc/moc.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
index 797595f..0ba7d53 100644
--- a/src/tools/moc/moc.cpp
+++ b/src/tools/moc/moc.cpp
@@ -429,7 +429,7 @@ bool Moc::parseMaybeFunction(const ClassDef *cdef, FunctionDef *def)
{
def->isVirtual = false;
//skip modifiers and attributes
- while (test(INLINE) || test(STATIC) ||
+ while (test(EXPLICIT) || test(INLINE) || test(STATIC) ||
(test(VIRTUAL) && (def->isVirtual = true)) //mark as virtual
|| testFunctionAttribute(def)) {}
bool tilde = test(TILDE);