Merge remote-tracking branch 'origin/4.6'

Change-Id: I724da8f761275865e735e7dce10c3b2b2d99fe94

src/libs/qmljs/parser/qmljslexer.cpp

@@ -32,6 +32,8 @@
 #include <QtCore/qvarlengtharray.h>
 #include <QtCore/qdebug.h>
 
+#include <utils/qtcfallthrough.h>
+
 QT_BEGIN_NAMESPACE
 Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);
 QT_END_NAMESPACE
@@ -759,7 +761,7 @@ again:
                         u = QLatin1Char('\0');
                         break;
                     }
-                    // fall through
+                    Q_FALLTHROUGH();
                 case '1':
                 case '2':
                 case '3':