diff options
author | Eike Ziller <eike.ziller@qt.io> | 2017-07-18 15:23:29 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2017-07-18 15:23:29 +0200 |
commit | 361fdad3be3421496be4dab014a8bee369687387 (patch) | |
tree | 4412737d90b20953064b8f53817c014ddc9714c3 /src/libs/3rdparty/cplusplus | |
parent | 5e38bdbfd8bef6c3bdcede9fe0be11f34e9a0f7c (diff) | |
parent | 41ae823bda7cc1bad4b85861d9b0e3087c130e4a (diff) |
Merge remote-tracking branch 'origin/4.4'
Change-Id: I778acc044ac105a11054b314aecac5b1c2cfee6a
Diffstat (limited to 'src/libs/3rdparty/cplusplus')
-rw-r--r-- | src/libs/3rdparty/cplusplus/Parser.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libs/3rdparty/cplusplus/Parser.cpp b/src/libs/3rdparty/cplusplus/Parser.cpp index 8754206a0b..16f351077a 100644 --- a/src/libs/3rdparty/cplusplus/Parser.cpp +++ b/src/libs/3rdparty/cplusplus/Parser.cpp @@ -27,6 +27,8 @@ #include "ObjectiveCTypeQualifiers.h" #include "QtContextKeywords.h" +#include <utils/qtcfallthrough.h> + #include <unordered_map> #include <utility> @@ -442,7 +444,7 @@ bool Parser::skipUntilStatement() case T_AT_THROW: if (_languageFeatures.objCEnabled) return true; - + Q_FALLTHROUGH(); default: consumeToken(); } |