diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-12-15 15:21:23 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-12-19 09:35:57 +0000 |
| commit | 6614f7754c2616aa66ddd9bbad23d0f415db5b6c (patch) | |
| tree | 2c57860ab3a0690107ffedf1261fdabe66c03314 /src/tools/moc | |
| parent | 7adfe7494bb4a2c1d3a036fe9dfd946bc00c5d49 (diff) | |
Silence implicit-fallthough warnings
Fixes Werror build with GCC 7.
Change-Id: Ie0e9fb907af545b6c200558faaaf83b8ec058b7a
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/tools/moc')
| -rw-r--r-- | src/tools/moc/moc.cpp | 1 | ||||
| -rw-r--r-- | src/tools/moc/parser.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index 89bf2bd6a1..03f022da69 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -197,6 +197,7 @@ Type Moc::parseType() prev(); break; } + Q_FALLTHROUGH(); case CHAR: case SHORT: case INT: diff --git a/src/tools/moc/parser.h b/src/tools/moc/parser.h index ee8761108b..bedcbbf7e2 100644 --- a/src/tools/moc/parser.h +++ b/src/tools/moc/parser.h @@ -68,8 +68,8 @@ public: inline QByteArray unquotedLexem() { return symbols.at(index-1).unquotedLexem();} inline const Symbol &symbol() { return symbols.at(index-1);} - void error(int rollback); - void error(const char *msg = 0); + Q_NORETURN void error(int rollback); + Q_NORETURN void error(const char *msg = 0); void warning(const char * = 0); void note(const char * = 0); |