diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-01-25 10:20:06 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-01-25 10:20:06 +0100 |
| commit | 32c938c4a032c7ef20de419a3886d2a2226d75df (patch) | |
| tree | 14bf3b2aa9aa09b7b51a66a2b1d942de30fe7781 /src/libs/qmljs/parser/qmljslexer.cpp | |
| parent | 333d30dce5c96a19c93ebca7783dbbd8fbca6530 (diff) | |
| parent | ebede577b6b452f2901fa8ee5739d2008c790860 (diff) | |
| download | qt-creator-32c938c4a032c7ef20de419a3886d2a2226d75df.tar.gz | |
Merge remote-tracking branch 'origin/4.6'
Change-Id: I724da8f761275865e735e7dce10c3b2b2d99fe94
Diffstat (limited to 'src/libs/qmljs/parser/qmljslexer.cpp')
| -rw-r--r-- | src/libs/qmljs/parser/qmljslexer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libs/qmljs/parser/qmljslexer.cpp b/src/libs/qmljs/parser/qmljslexer.cpp index a4cb83bc74..0e0a57f7a2 100644 --- a/src/libs/qmljs/parser/qmljslexer.cpp +++ b/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': |