diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2018-01-23 14:02:49 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-01-25 21:01:26 +0000 |
commit | fff473c6387b0ab241a9b2e1f6e8843d777befb8 (patch) | |
tree | def2e04fa3a7628f3755d473a34199ce5ed61329 /src/qml/types | |
parent | c8366096c41f44bd6f05dcd1aef4fd8372902c97 (diff) |
Remove some duplicated code
We can centralize the code that initializes a V4::Script instance used
in worker scripts as well as in the Qt.include() function.
Change-Id: I9a83f990c694eb4d793ec5ac3b1c917d8c068d06
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/types')
-rw-r--r-- | src/qml/types/qquickworkerscript.cpp | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp index d90b0ab490..231c0fa810 100644 --- a/src/qml/types/qquickworkerscript.cpp +++ b/src/qml/types/qquickworkerscript.cpp @@ -396,22 +396,10 @@ void QQuickWorkerScriptEnginePrivate::processLoad(int id, const QUrl &url) QV4::Scoped<QV4::QmlContext> qmlContext(scope, getWorker(script)); Q_ASSERT(!!qmlContext); - if (const QQmlPrivate::CachedQmlUnit *cachedUnit = QQmlMetaType::findCachedCompilationUnit(url)) { - QV4::CompiledData::CompilationUnit *jsUnit = cachedUnit->createCompilationUnit(); - program.reset(new QV4::Script(v4, qmlContext, jsUnit)); - } else { - QFile f(fileName); - if (!f.open(QIODevice::ReadOnly)) { - qWarning().nospace() << "WorkerScript: Cannot find source file " << url.toString(); - return; - } - - QByteArray data = f.readAll(); - QString sourceCode = QString::fromUtf8(data); - QmlIR::Document::removeScriptPragmas(sourceCode); - - program.reset(new QV4::Script(v4, qmlContext, sourceCode, url.toString())); - program->parse(); + program.reset(QV4::Script::createFromFileOrCache(v4, qmlContext, fileName, url)); + if (program.isNull()) { + qWarning().nospace() << "WorkerScript: Cannot find source file " << url.toString(); + return; } if (!v4->hasException) |