Merge remote-tracking branch 'origin/4.6'

Change-Id: I724da8f761275865e735e7dce10c3b2b2d99fe94

src/plugins/cpptools/cppcodeformatter.cpp

@@ -29,6 +29,7 @@
 #include <cplusplus/Lexer.h>
 
 #include <utils/qtcassert.h>
+#include <utils/qtcfallthrough.h>
 
 #include <QDebug>
 #include <QMetaEnum>
@@ -848,7 +849,7 @@ bool CodeFormatter::tryDeclaration()
                 return true;
             }
         }
-        // fallthrough
+        Q_FALLTHROUGH();
     case T_CHAR:
     case T_CHAR16_T:
     case T_CHAR32_T:
@@ -1231,7 +1232,7 @@ void QtStyleCodeFormatter::onEnter(int newState, int *indentDepth, int *savedInd
     case assign_open:
         if (parentState.type == assign_open_or_initializer)
             break;
-        // fallthrough
+        Q_FALLTHROUGH();
     case assign_open_or_initializer:
         if (!lastToken && m_styleSettings.alignAssignments)
             *paddingDepth = nextTokenPosition-*indentDepth;

src/plugins/cpptools/cppqtstyleindenter.cpp

@@ -29,6 +29,8 @@
 #include "cpptoolssettings.h"
 #include "cppcodestylepreferences.h"
 
+#include <utils/qtcfallthrough.h>
+
 #include <QChar>
 #include <QTextDocument>
 #include <QTextBlock>
@@ -79,7 +81,7 @@ static bool isElectricInLine(const QChar ch, const QString &text)
             return true;
         }
 
-        // fall-through
+        Q_FALLTHROUGH();
         // lines that start with : might have a constructor initializer list
     case '<':
     case '>': {