Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta2

Change-Id: Iad56858cfdc688957e7a8426f908ab0a641a3312

1 files changed, 3 insertions, 2 deletions

diff --git a/src/xmlpatterns/functions/qerrorfn.cpp b/src/xmlpatterns/functions/qerrorfn.cpp
index 19e9440..90f18c0 100644
--- a/src/xmlpatterns/functions/qerrorfn.cpp
+++ b/src/xmlpatterns/functions/qerrorfn.cpp
@@ -61,10 +61,11 @@ Item ErrorFN::evaluateSingleton(const DynamicContext::Ptr &context) const
             return Item();
         }
         case 3:
-        /* Fallthrough, we don't use the 'error object' param. */
+            /* Fallthrough, we don't use the 'error object' param. */
+            Q_FALLTHROUGH();
         case 2:
             msg = m_operands.at(1)->evaluateSingleton(context).stringValue();
-        /* Fall through. */
+            Q_FALLTHROUGH();
         case 1:
         {
             const QNameValue::Ptr qName(m_operands.first()->evaluateSingleton(context).as<QNameValue>());