diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-23 15:45:46 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-06-23 21:39:46 +0200 |
| commit | 73e7fad503336e6df87849e69ee8ea7e92914453 (patch) | |
| tree | 8c26e3f036f08c9654ab679c5be968bcea4827ec /src/qml/qml/qqmlvme.cpp | |
| parent | 6c7969462a6ede2850927bc3d0c77f7785f4663e (diff) | |
Fix failing tst_qqmlecmascript::qtbug_22843:"with .pragma library"
Try to to load a .pragma library type of script only once, even if
it has a syntax error.
Change-Id: I32d7fb71647f413dc75e339e7bff8d74f7754c87
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlvme.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvme.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp index 7ca6f4f44f..309275777e 100644 --- a/src/qml/qml/qqmlvme.cpp +++ b/src/qml/qml/qqmlvme.cpp @@ -1159,8 +1159,11 @@ QV4::PersistentValue QQmlVME::run(QQmlContextData *parentCtxt, QQmlScriptData *s } } - if (!script->m_program) + if (!script->m_program) { + if (shared) + script->m_loaded = true; return QV4::PersistentValue(); + } QV4::Value qmlglobal = QV4::QmlContextWrapper::qmlScope(v8engine, ctxt, 0); QV4::QmlContextWrapper::takeContextOwnership(qmlglobal); |