diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-03 15:34:49 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-03 15:34:49 +0200 |
| commit | 2dd35a47a0af90ef3a31e3d3c7007a28f4346467 (patch) | |
| tree | 9c816a4cb82e04e7a6d07b99085b7a8dcb430ece /src | |
| parent | 0f51d6a228b1d042b8ffc1f9436c7d253a454345 (diff) | |
| parent | 6ca95b9cbb8934fecfe739026745d5df82e2ba92 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I26b42db1fde32e787929f7c2bd95791d791d41ee
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; |