diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-07-03 10:24:09 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-07-03 10:24:09 +0200 |
| commit | 26e96bfad86235959d30b5f8da169dc2ecc38b68 (patch) | |
| tree | 76e1b44584bc86840a078d777ebffdec6463c33b /src/shared | |
| parent | 64c8c37bd479a4d1d284e552e5c02e47a288ff0a (diff) | |
| parent | a3b4006627df5f78e99579129dd64b4c9cdef960 (diff) | |
Merge remote-tracking branch 'origin/11.0'
Conflicts:
src/plugins/debugger/debuggeritemmanager.cpp
Change-Id: I9d99d13feff9315f52eacbd84857c63cb69bf804
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/json/json.cpp | 4 | ||||
| -rw-r--r-- | src/shared/proparser/qmakebuiltins.cpp | 2 | ||||
| -rw-r--r-- | src/shared/proparser/qmakeevaluator.cpp | 7 | ||||
| -rw-r--r-- | src/shared/proparser/qmakeparser.cpp | 2 | ||||
| m--------- | src/shared/qbs | 0 |
5 files changed, 8 insertions, 7 deletions
diff --git a/src/shared/json/json.cpp b/src/shared/json/json.cpp index 4f9c94ef376..759fea61f92 100644 --- a/src/shared/json/json.cpp +++ b/src/shared/json/json.cpp @@ -4806,7 +4806,7 @@ bool Value::isValid(const Base *b) const case JsonValue::Double: if (intValue) break; - // fall through + [[fallthrough]]; case JsonValue::String: case JsonValue::Array: case JsonValue::Object: @@ -4885,7 +4885,7 @@ uint32_t Value::valueToStore(const JsonValue &v, uint32_t offset) if (c != INT_MAX) return c; } - // fall through + [[fallthrough]]; case JsonValue::String: case JsonValue::Array: case JsonValue::Object: diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp index 787d9effb9b..87707106e61 100644 --- a/src/shared/proparser/qmakebuiltins.cpp +++ b/src/shared/proparser/qmakebuiltins.cpp @@ -287,7 +287,7 @@ QMakeEvaluator::quoteValue(const ProString &val) break; case 32: quote = true; - // fallthrough + [[fallthrough]]; default: ret += c; break; diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index ced40f106d0..0ea6c7f1334 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -295,7 +295,8 @@ ProStringList QMakeEvaluator::split_value_list(QStringView vals, int source) --x; } } - // fallthrough + hadWord = true; + break; default: hadWord = true; break; @@ -1661,7 +1662,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::expandVariableReferences( tokPtr++; continue; } - // fallthrough + [[fallthrough]]; default: Q_ASSERT_X(false, "expandVariableReferences", "Unrecognized token"); break; @@ -2137,7 +2138,7 @@ QString QMakeEvaluator::formatValue(const ProString &val, bool forceQuote) break; case 32: quote = true; - // fallthrough + [[fallthrough]]; default: ret += c; break; diff --git a/src/shared/proparser/qmakeparser.cpp b/src/shared/proparser/qmakeparser.cpp index 758a80ce4ac..0e8d888535e 100644 --- a/src/shared/proparser/qmakeparser.cpp +++ b/src/shared/proparser/qmakeparser.cpp @@ -1563,7 +1563,7 @@ static bool getBlock(const ushort *tokens, int limit, int &offset, QString *outS case TokRemove: case TokReplace: // The parameter is the sizehint for the output. - // fallthrough + [[fallthrough]]; case TokLine: { ushort dummy; ok = getUshort(tokens, limit, offset, &dummy, outStr); diff --git a/src/shared/qbs b/src/shared/qbs -Subproject 1af935aec680a3e2df3919807f631a6ee2c21e3 +Subproject 97769dfdacd006f4d82b240371e3ca79d445ab7 |