summaryrefslogtreecommitdiffstats
path: root/src/tools/moc
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-02-12 16:36:40 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-19 07:55:39 +0100
commit3988ad95f757f7531e8133a10e83f74ab0ce1b96 (patch)
tree1b8d7ccc0fe2ed766bbf99de41f066b050801eb5 /src/tools/moc
parentcfc09b656420a42a9f4b8e7b8b3ebe4fc4a426a2 (diff)
moc: Error out when detecting unterminated macro usage
Exhausting the symbol list while looking for the final right parenthesis means it is missing. Task-number: QTBUG-29308 Change-Id: Iccf5897b0f5eb719699fd12d6c8e4a16ff189d9b Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/tools/moc')
-rw-r--r--src/tools/moc/preprocessor.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/moc/preprocessor.cpp b/src/tools/moc/preprocessor.cpp
index 7430c4a86c..96b920b7cd 100644
--- a/src/tools/moc/preprocessor.cpp
+++ b/src/tools/moc/preprocessor.cpp
@@ -630,6 +630,8 @@ Symbols Preprocessor::macroExpandIdentifier(Preprocessor *that, SymbolStack &sym
if (nesting < 0)
break;
+ else if (!symbols.hasNext())
+ that->error("missing ')' in macro usage");
}
// empty VA_ARGS