diff options
author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-05-27 16:22:36 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-05-27 16:22:36 +0200 |
commit | bcb916bec1e0b5cbd169367819e825f04115751f (patch) | |
tree | 1874d90dcd418bdd9accc22dac8c762691d2e6e0 | |
parent | 4836860343de35124ecf98008ffd548419918ee7 (diff) | |
parent | a368b5fdf4d33361e03a2f05b6f159566dd06e9d (diff) |
Merge 5.12 into 5.12.4
Change-Id: I84be737c8ab49128e8de26a97ffafd653c542108
-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; |