diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-03-18 23:39:02 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-19 17:24:01 +0100 |
| commit | 12e55eaa653107982de9b88f6459f0e16660a35e (patch) | |
| tree | 462b1d84a7a62168868b299ee03b1df10cc9d399 /src/qml/types | |
| parent | 8a0573b92924ba3fcf4228730c2c693b52c41c28 (diff) | |
Cleanup: Remove last traces of QQmlScript
What remains is the code for removing .pragma from script source code (and
replacing it with white-space to preserve line/column numbers). The previous
code even returned the value of the pragmas, but for the remaining caller sites
that value isn't used, so we can just return void.
Change-Id: I16db15da236970660b817d6c4493005365a7a1af
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/types')
| -rw-r--r-- | src/qml/types/qqmllistmodel.cpp | 1 | ||||
| -rw-r--r-- | src/qml/types/qquickworkerscript.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp index 82517bd3f4..f9badcd381 100644 --- a/src/qml/types/qqmllistmodel.cpp +++ b/src/qml/types/qqmllistmodel.cpp @@ -47,7 +47,6 @@ #include <private/qqmlcustomparser_p.h> -#include <private/qqmlscript_p.h> #include <private/qqmlengine_p.h> #include <private/qv4object_p.h> diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp index 111ef68a98..507e94fb7e 100644 --- a/src/qml/types/qquickworkerscript.cpp +++ b/src/qml/types/qquickworkerscript.cpp @@ -386,7 +386,7 @@ void QQuickWorkerScriptEnginePrivate::processLoad(int id, const QUrl &url) if (f.open(QIODevice::ReadOnly)) { QByteArray data = f.readAll(); QString sourceCode = QString::fromUtf8(data); - QQmlScript::Parser::extractPragmas(sourceCode); + QmlIR::Document::removeScriptPragmas(sourceCode); WorkerScript *script = workers.value(id); if (!script) |