summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-07-31 02:01:00 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-07-31 02:01:00 (GMT)
commit1835decbcfe6c95de3c895cb5bf2d0cefe4d2643 (patch)
treeb5db0d8b49a4d421fd2e36c2f295d69909fca914 /src/tools
parent52e52af114a9ebb2534de0573ee52550dfdd0130 (diff)
parent56b6a5924008ab5cdbae36e9662eddba923acd5e (diff)
downloadQt-1835decbcfe6c95de3c895cb5bf2d0cefe4d2643.zip
Qt-1835decbcfe6c95de3c895cb5bf2d0cefe4d2643.tar.gz
Qt-1835decbcfe6c95de3c895cb5bf2d0cefe4d2643.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/tools')
-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 aa11d0e..74b1a67 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);