diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-03-28 08:27:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-03-28 08:27:57 +0200 |
| commit | 198409ba76e18587526e9e1ec84fdb432c671937 (patch) | |
| tree | 2d06c052272ddfd1c9b34b863e342826a31d20b9 /src/3rdparty | |
| parent | 9a98d16d9e49395a24cd733ca8f65b2f82ebba94 (diff) | |
| parent | e696a6b7bff04d1581cf59b4d96ecb5508f54169 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
tests/auto/qml/qjsengine/tst_qjsengine.cpp
Change-Id: I8276669e257f35a76768ef7f8795a8605cf4c9bc
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/yarr/YarrInterpreter.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/masm/yarr/YarrInterpreter.cpp b/src/3rdparty/masm/yarr/YarrInterpreter.cpp index 4a789f6f28..16fc183cad 100644 --- a/src/3rdparty/masm/yarr/YarrInterpreter.cpp +++ b/src/3rdparty/masm/yarr/YarrInterpreter.cpp @@ -731,6 +731,7 @@ public: context->term -= term.atom.parenthesesWidth; return false; } + Q_FALLTHROUGH(); case QuantifierNonGreedy: if (backTrack->begin == notFound) { backTrack->begin = input.getPos(); |