Introduce Q_FALLTHROUGH()

Silence g++ 7.X warnings.

Change-Id: I1360e74620a3b52f684832991d7682e8c808f5b5
Reviewed-by: Martin Smith <martin.smith@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

5 files changed, 12 insertions, 12 deletions

diff --git a/src/designer/src/lib/shared/qdesigner_menu.cpp b/src/designer/src/lib/shared/qdesigner_menu.cpp
index d14c48b45..ccb7f8520 100644
--- a/src/designer/src/lib/shared/qdesigner_menu.cpp
+++ b/src/designer/src/lib/shared/qdesigner_menu.cpp
@@ -279,7 +279,7 @@ bool QDesignerMenu::handleKeyPressEvent(QWidget * /*widget*/, QKeyEvent *e)
                 moveDown(false);
                 break;
             }
-            // fall through
+            Q_FALLTHROUGH();
 
         case Qt::Key_Escape:
             m_editor->hide();
diff --git a/src/designer/src/lib/shared/qdesigner_menubar.cpp b/src/designer/src/lib/shared/qdesigner_menubar.cpp
index a264737bc..639fbd96f 100644
--- a/src/designer/src/lib/shared/qdesigner_menubar.cpp
+++ b/src/designer/src/lib/shared/qdesigner_menubar.cpp
@@ -279,7 +279,7 @@ bool QDesignerMenuBar::handleKeyPressEvent(QWidget *, QKeyEvent *e)
                 showMenu();
                 break;
             }
-            // fall through
+            Q_FALLTHROUGH();
 
         case Qt::Key_Escape:
             update();
diff --git a/src/linguist/lupdate/cpp.cpp b/src/linguist/lupdate/cpp.cpp
index 71ac8cf16..6b6600059 100644
--- a/src/linguist/lupdate/cpp.cpp
+++ b/src/linguist/lupdate/cpp.cpp
@@ -924,7 +924,7 @@ CppParser::TokenType CppParser::getToken()
                 }
                 if (yyCh < '0' || yyCh > '9')
                     return Tok_Null;
-                // Fallthrough
+                Q_FALLTHROUGH();
             case '1':
             case '2':
             case '3':
@@ -1786,7 +1786,7 @@ void CppParser::parseInternal(ConversionData &cd, const QStringList &includeStac
                 break;
             }
         }
-        /* fall through */
+        Q_FALLTHROUGH();
         case Tok_AngledInclude: {
             QStringList cSources = cd.m_allCSources.values(yyWord);
             if (!cSources.isEmpty()) {
@@ -2071,7 +2071,7 @@ void CppParser::parseInternal(ConversionData &cd, const QStringList &includeStac
                     pendingContext.clear();
                 }
             }
-            // fallthrough
+            Q_FALLTHROUGH();
         case Tok_Semicolon:
             prospectiveContext.clear();
             prefix.clear();
@@ -2118,10 +2118,10 @@ void CppParser::parseInternal(ConversionData &cd, const QStringList &includeStac
                     yyTokColonSeen = false;
                 }
             }
-            // fallthrough
+            Q_FALLTHROUGH();
         case Tok_LeftParen:
             yyTokIdentSeen = false;
-            // fallthrough
+            Q_FALLTHROUGH();
         case Tok_Comma:
         case Tok_QuestionMark:
             metaExpected = true;
@@ -2134,7 +2134,7 @@ void CppParser::parseInternal(ConversionData &cd, const QStringList &includeStac
         default:
             if (!yyParenDepth)
                 prospectiveContext.clear();
-            // fallthrough
+            Q_FALLTHROUGH();
         case Tok_RightBracket: // ignoring indexing; for static initializers
         case_default:
             yyTok = getToken();
diff --git a/src/linguist/shared/qm.cpp b/src/linguist/shared/qm.cpp
index cdca3a113..6963ad6cb 100644
--- a/src/linguist/shared/qm.cpp
+++ b/src/linguist/shared/qm.cpp
@@ -231,10 +231,10 @@ void Releaser::writeMessage(const ByteTranslatorMessage &msg, QDataStream &strea
     default:
     case HashContextSourceTextComment:
         stream << quint8(Tag_Comment) << msg.comment();
-        // fall through
+        Q_FALLTHROUGH();
     case HashContextSourceText:
         stream << quint8(Tag_SourceText) << msg.sourceText();
-        // fall through
+        Q_FALLTHROUGH();
     case HashContext:
         stream << quint8(Tag_Context) << msg.context();
         break;
diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp
index 10f239d7d..5fd26ec31 100644
--- a/src/qdoc/htmlgenerator.cpp
+++ b/src/qdoc/htmlgenerator.cpp
@@ -589,7 +589,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark
         break;
     case Atom::CodeNew:
         out() << "<p>you can rewrite it as</p>\n";
-        // fallthrough
+        Q_FALLTHROUGH();
     case Atom::Code:
         out() << "<pre class=\"cpp\">"
               << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),relative), codePrefix, codeSuffix)
@@ -597,7 +597,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark
         break;
     case Atom::CodeOld:
         out() << "<p>For example, if you have code like</p>\n";
-        // fallthrough
+        Q_FALLTHROUGH();
     case Atom::CodeBad:
         out() << "<pre class=\"cpp plain\">"
               << trimmedTrailing(protectEnc(plainCode(indent(codeIndent,atom->string()))), codePrefix, codeSuffix)