diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2018-03-02 15:13:45 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2018-03-14 09:39:14 +0000 |
| commit | 19e0fc747ea3acf069c8c26c8fb2f1941bc916f2 (patch) | |
| tree | 308e64653f1dd1fc8b700c094cc3c1d4870a2a77 /src | |
| parent | 4c0a363a9a0b73c68fd252cba705396d4378b209 (diff) | |
moc: Don't error our when parsing "using namespace __identifier(...)"
This follows on from a2322519929bd36a90422dccc0310b8230729197 which
covered a similar instance of this. As with that change, we should not
abort the compilation, just ignore it.
Task-number: QTBUG-63772
Change-Id: Ide958080a90f43ed19edd8a320e7d45de1c96821
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
(cherry picked from commit 0da3ebd9940a214cc7ea292d13cd86967cd89a66)
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/moc/moc.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index 4d3ccb8680..c44502c953 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -674,6 +674,9 @@ void Moc::parse() if (test(NAMESPACE)) { while (test(SCOPE) || test(IDENTIFIER)) ; + // Ignore invalid code such as: 'using namespace __identifier("x")' (QTBUG-63772) + if (test(LPAREN)) + until(RPAREN); next(SEMIC); } break; |