diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-10 16:51:58 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-24 14:50:43 +0000 |
| commit | f482270432761e72b87fb368c2a379cd59b169b3 (patch) | |
| tree | 11bbf09187ef36eb23c51a55e4b6e617ed4b8cfb /src/shared/json/json.cpp | |
| parent | 66488ba0b8d8fd7111e75fc53f37af4e4f51a12e (diff) | |
| download | qt-creator-f482270432761e72b87fb368c2a379cd59b169b3.tar.gz | |
Introduce Q_FALLTHROUGH()
Silence g++ 7.X warnings.
Change-Id: I9d06d04b496c9ec060e13e1be6f43d8fbadb1f3b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/shared/json/json.cpp')
| -rw-r--r-- | src/shared/json/json.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/shared/json/json.cpp b/src/shared/json/json.cpp index 58e6beb06d..eab44f4659 100644 --- a/src/shared/json/json.cpp +++ b/src/shared/json/json.cpp @@ -51,6 +51,7 @@ #include "json.h" +#include "../../libs/utils/qtcfallthrough.h" //#define PARSER_DEBUG #ifdef PARSER_DEBUG @@ -4843,7 +4844,7 @@ bool Value::isValid(const Base *b) const case JsonValue::Double: if (intValue) break; - // fall through + Q_FALLTHROUGH(); case JsonValue::String: case JsonValue::Array: case JsonValue::Object: @@ -4922,7 +4923,7 @@ uint32_t Value::valueToStore(const JsonValue &v, uint32_t offset) if (c != INT_MAX) return c; } - // fall through + Q_FALLTHROUGH(); case JsonValue::String: case JsonValue::Array: case JsonValue::Object: |