diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-26 00:37:14 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-01-26 00:37:14 +0000 |
| commit | 398a7e736cb42ac42f0887989585b1121b7e6e62 (patch) | |
| tree | 916854b706b9b057fa1483f76dd48998a8aa28a0 /src/tools | |
| parent | 4d3a35f63788fa5ff7a11a5bb7bd6176bd2ac70e (diff) | |
| parent | 318b58562ae89453fb98e8145cd0440e14ba60b0 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.8' into dev" into refs/staging/dev
Diffstat (limited to 'src/tools')
| -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); |