diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-07-30 08:11:57 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-07-30 08:13:35 (GMT) |
| commit | 9523b27be4fe00870d19c4ff4caa2d78dcf520e6 (patch) | |
| tree | 54a8dec77cf9f165072ebb48f9a74bbc78aa502e | |
| parent | d09fa4a816c6b9ccf306b7e1a887c4a4b1dc2f4e (diff) | |
| download | Qt-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
| -rw-r--r-- | src/tools/moc/moc.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/moc/tst_moc.cpp | 7 |
2 files changed, 8 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); diff --git a/tests/auto/moc/tst_moc.cpp b/tests/auto/moc/tst_moc.cpp index d66791f..488f068 100644 --- a/tests/auto/moc/tst_moc.cpp +++ b/tests/auto/moc/tst_moc.cpp @@ -1157,6 +1157,13 @@ void tst_Moc::constructors() QObject *o3 = mo->newInstance(Q_ARG(QString, str)); QVERIFY(o3 != 0); QCOMPARE(qobject_cast<CtorTestClass*>(o3)->m_str, str); + + { + //explicit constructor + QObject *o = QObject::staticMetaObject.newInstance(); + QVERIFY(o); + delete o; + } } #include "task234909.h" |