diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-02 20:57:47 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-02 20:57:47 +0200 |
| commit | d4919f95538b1766e79886c44642969851aae531 (patch) | |
| tree | fce106a5e734c099a9af35d5bd94e49b42002c56 /src | |
| parent | 68c9234b67ca0939fcf6607d87bda90b93170567 (diff) | |
| parent | a368b5fdf4d33361e03a2f05b6f159566dd06e9d (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I0d9f4c33a54c19d3f7707ae515eea90779219491
Diffstat (limited to 'src')
| -rw-r--r-- | src/scxml/qscxmlcompiler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/scxml/qscxmlcompiler.cpp b/src/scxml/qscxmlcompiler.cpp index e2e9b4c..36967d1 100644 --- a/src/scxml/qscxmlcompiler.cpp +++ b/src/scxml/qscxmlcompiler.cpp @@ -1589,7 +1589,7 @@ bool QScxmlCompilerPrivate::preReadElementOnEntry() current().instructionContainer = m_doc->newSequence(&s->onEntry); break; } - // intentional fall-through + Q_FALLTHROUGH(); default: addError(QStringLiteral("unexpected container state for onentry")); break; @@ -1608,7 +1608,7 @@ bool QScxmlCompilerPrivate::preReadElementOnExit() current().instructionContainer = m_doc->newSequence(&s->onExit); break; } - // intentional fall-through + Q_FALLTHROUGH(); default: addError(QStringLiteral("unexpected container state for onexit")); break; |