diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2018-01-24 16:36:41 +0100 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2018-01-25 06:04:27 +0000 |
| commit | e54c5149841964d9527b04517441e0d9e64770d8 (patch) | |
| tree | c802c1ad684fbe514745efe101720174d6715a14 /src/libs/qmljs | |
| parent | eb9172d1a0caf929bb7787e7b2cf040fe5da42eb (diff) | |
Fix build with Qt 5.6 / qtcreator.qbs
Broke with:
Introduce Q_FALLTHROUGH()
commit f482270432761e72b87fb368c2a379cd59b169b3
Change-Id: I4f99f9a4d8a56ab1358be53f83aa0c449cff69a8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/libs/qmljs')
| -rw-r--r-- | src/libs/qmljs/parser/qmljslexer.cpp | 2 | ||||
| -rw-r--r-- | src/libs/qmljs/qmljscodeformatter.cpp | 2 | ||||
| -rw-r--r-- | src/libs/qmljs/qmljsevaluate.cpp | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/libs/qmljs/parser/qmljslexer.cpp b/src/libs/qmljs/parser/qmljslexer.cpp index 0fa9c748052..caa69df1a29 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 diff --git a/src/libs/qmljs/qmljscodeformatter.cpp b/src/libs/qmljs/qmljscodeformatter.cpp index 8c34cdc4acb..70c17094065 100644 --- a/src/libs/qmljs/qmljscodeformatter.cpp +++ b/src/libs/qmljs/qmljscodeformatter.cpp @@ -30,6 +30,8 @@ #include <QTextBlock> #include <QTextDocument> +#include <utils/qtcfallthrough.h> + static Q_LOGGING_CATEGORY(formatterLog, "qtc.qmljs.formatter") namespace QmlJS { diff --git a/src/libs/qmljs/qmljsevaluate.cpp b/src/libs/qmljs/qmljsevaluate.cpp index 26ba2e56b5b..44414e27b99 100644 --- a/src/libs/qmljs/qmljsevaluate.cpp +++ b/src/libs/qmljs/qmljsevaluate.cpp @@ -29,6 +29,8 @@ #include "qmljsvalueowner.h" #include "parser/qmljsast_p.h" +#include <utils/qtcfallthrough.h> + using namespace QmlJS; /*! |