diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-04 10:24:46 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-04 10:28:48 +0200 |
| commit | 9556f6d075b61fa95d6e1057f305e522a26f71d6 (patch) | |
| tree | 53190472453390810c47b9b5a47b23188a00267e /tools | |
| parent | 42ffe9b193a5bd958b0853233fd0d94170722bd1 (diff) | |
| parent | 1fd0cdc6a2e01775d8a79c6614910cc5a2fbf2b3 (diff) | |
| download | qtdeclarative-9556f6d075b61fa95d6e1057f305e522a26f71d6.tar.gz qtdeclarative-9556f6d075b61fa95d6e1057f305e522a26f71d6.tar.bz2 qtdeclarative-9556f6d075b61fa95d6e1057f305e522a26f71d6.zip | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/qml/jsruntime/qv4engine_p.h
src/quick/items/qquickitemsmodule.cpp
src/quick/items/qquicktext.cpp
src/quick/util/qquickpixmapcache.cpp
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
Change-Id: I90ecaad6a4bfaa4f36149a7463f4d7141f4a516a
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmllint/main.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/qmllint/main.cpp b/tools/qmllint/main.cpp index 9fd6c3607..a1161c635 100644 --- a/tools/qmllint/main.cpp +++ b/tools/qmllint/main.cpp @@ -41,7 +41,6 @@ #include <private/qqmljslexer_p.h> #include <private/qqmljsparser_p.h> #include <private/qqmljsengine_p.h> -#include <private/qqmlirbuilder_p.h> static bool lint_file(const QString &filename, bool silent) { @@ -59,10 +58,7 @@ static bool lint_file(const QString &filename, bool silent) QFileInfo info(filename); bool isJavaScript = info.suffix().toLower() == QLatin1String("js"); - if (isJavaScript) - QmlIR::Document::removeScriptPragmas(/*by-ref*/code); - - lexer.setCode(code, /*line = */ 1, true); + lexer.setCode(code, /*line = */ 1, /*qmlMode=*/ !isJavaScript); QQmlJS::Parser parser(&engine); bool success = isJavaScript ? parser.parseProgram() : parser.parse(); |