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/jsruntime | |
| 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/jsruntime')
| -rw-r--r-- | src/qml/jsruntime/qv4include.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp index 7642db1e9b..d5bae0e35e 100644 --- a/src/qml/jsruntime/qv4include.cpp +++ b/src/qml/jsruntime/qv4include.cpp @@ -148,7 +148,7 @@ void QV4Include::finished() QByteArray data = m_reply->readAll(); QString code = QString::fromUtf8(data); - QQmlScript::Parser::extractPragmas(code); + QmlIR::Document::removeScriptPragmas(code); QV4::ScopedObject qmlglobal(scope, m_qmlglobal.value()); QV4::Script script(v4, qmlglobal, code, m_url.toString()); @@ -216,7 +216,7 @@ QV4::ReturnedValue QV4Include::method_include(QV4::CallContext *ctx) if (f.open(QIODevice::ReadOnly)) { QByteArray data = f.readAll(); QString code = QString::fromUtf8(data); - QQmlScript::Parser::extractPragmas(code); + QmlIR::Document::removeScriptPragmas(code); QV4::Script script(v4, qmlcontextobject, code, url.toString()); |