Merge 5.12 into 5.12.4

Change-Id: I84be737c8ab49128e8de26a97ffafd653c542108

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;