diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-09-10 13:57:23 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-25 00:08:16 +0200 |
| commit | 99194d1db61b6ad3f5aff3bec1f46a3bcf3f242e (patch) | |
| tree | 24855b28a021eb912598b7eb35696a7e3ec90577 /src/tools/moc/util | |
| parent | 38f1b4eeaeb013983126c155a9b25e08074c41f7 (diff) | |
Moc: Make # and ## valid tokens in cpp parsing mode
This is required so preprocessing macros with arguments
can work correctly.
Change-Id: Ia30ede6a3579be13800bf1255d313748e2d696f9
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/tools/moc/util')
| -rw-r--r-- | src/tools/moc/util/generate_keywords.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/moc/util/generate_keywords.cpp b/src/tools/moc/util/generate_keywords.cpp index ab981c1d5c..d04e53653c 100644 --- a/src/tools/moc/util/generate_keywords.cpp +++ b/src/tools/moc/util/generate_keywords.cpp @@ -256,6 +256,7 @@ static const Keyword keywords[] = { { " ", "WHITESPACE" }, { "\t", "WHITESPACE" }, { "#", "HASH" }, + { "##", "PP_HASHHASH" }, { "\\", "BACKSLASH" }, { "//", "CPP_COMMENT" }, { "/*", "C_COMMENT" }, |