← Back to branch summary

~ubuntu-branches/ubuntu/vivid/qtdeclarative-opensource-src-gles/vivid

~ubuntu-branches/ubuntu/vivid/qtdeclarative-opensource-src-gles/vivid

« back to all changes in this revision

Viewing changes to src/qml/qml/qqmljavascriptexpression.cpp

Committer: Package Import Robot
Author(s): Timo Jyrinki
Date: 2015-02-26 09:12:59 UTC
Revision ID: package-import@ubuntu.com-20150226091259-krq068zh9bwi20or

Tags: 5.4.0-0ubuntu2

Sync package with qtdeclarative-opensource-src - 5.4.0-4ubuntu2

files added:
.pc/Fix-regression-where-QQuickScreenAttached-overwrites.patch

.pc/Fix-regression-where-QQuickScreenAttached-overwrites.patch/src

.pc/Fix-regression-where-QQuickScreenAttached-overwrites.patch/src/quick

.pc/Fix-regression-where-QQuickScreenAttached-overwrites.patch/src/quick/items

.pc/Fix-regression-where-QQuickScreenAttached-overwrites.patch/src/quick/items/qquickscreen.cpp

.pc/Fix-regression-where-QQuickScreenAttached-overwrites.patch/src/quick/items/qquickscreen_p.h

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/3rdparty

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/3rdparty/masm

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/3rdparty/masm/assembler

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/3rdparty/masm/assembler/ARMv7Assembler.h

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/3rdparty/masm/assembler/AbstractMacroAssembler.h

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/3rdparty/masm/assembler/AssemblerBuffer.h

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/3rdparty/masm/assembler/LinkBuffer.h

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/3rdparty/masm/assembler/X86Assembler.h

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/compiler

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/compiler/compiler.pri

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/compiler/qqmlirbuilder.cpp

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/compiler/qqmltypecompiler.cpp

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/compiler/qqmltypecompiler_p.h

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/compiler/qv4compileddata_p.h

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/compiler/qv4isel_moth.cpp

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/compiler/qv4isel_moth_p.h

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/compiler/qv4isel_p.cpp

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/compiler/qv4isel_p.h

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/jit

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/jit/qv4assembler.cpp

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/jit/qv4assembler_p.h

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/jit/qv4cachedlinkdata_p.h

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/jit/qv4isel_masm.cpp

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/jit/qv4isel_masm_p.h

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/jsruntime

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/jsruntime/qv4functionobject.cpp

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/jsruntime/qv4global_p.h

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/jsruntime/qv4qobjectwrapper.cpp

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/jsruntime/qv4script.cpp

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/qml

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/qml/qqmlengine.cpp

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/qml/qqmlengine_p.h

.pc/QML-Compilation-unit-caching-and-JIT-changes.patch/src/qml/qml/qqmljavascriptexpression.cpp

debian/patches/Fix-regression-where-QQuickScreenAttached-overwrites.patch

debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch

src/qml/jit/qv4cachedlinkdata_p.h

files modified:
.pc/applied-patches

debian/changelog

debian/patches/series

src/3rdparty/masm/assembler/ARMv7Assembler.h

src/3rdparty/masm/assembler/AbstractMacroAssembler.h

src/3rdparty/masm/assembler/AssemblerBuffer.h

src/3rdparty/masm/assembler/LinkBuffer.h

src/3rdparty/masm/assembler/X86Assembler.h

src/qml/compiler/compiler.pri

src/qml/compiler/qqmlirbuilder.cpp

src/qml/compiler/qqmltypecompiler.cpp

src/qml/compiler/qqmltypecompiler_p.h

src/qml/compiler/qv4compileddata_p.h

src/qml/compiler/qv4isel_moth.cpp

src/qml/compiler/qv4isel_moth_p.h

src/qml/compiler/qv4isel_p.cpp

src/qml/compiler/qv4isel_p.h

src/qml/jit/qv4assembler.cpp

src/qml/jit/qv4assembler_p.h

src/qml/jit/qv4isel_masm.cpp

src/qml/jit/qv4isel_masm_p.h

src/qml/jsruntime/qv4functionobject.cpp

src/qml/jsruntime/qv4global_p.h

src/qml/jsruntime/qv4qobjectwrapper.cpp

src/qml/jsruntime/qv4script.cpp

src/qml/qml/qqmlengine.cpp

src/qml/qml/qqmlengine_p.h

src/qml/qml/qqmljavascriptexpression.cpp

src/quick/items/qquickscreen.cpp

src/quick/items/qquickscreen_p.h

Show diffs side-by-side

added added

removed removed

src/qml/qml/qqmljavascriptexpression.cpp

327

327

328

328

QV4::ScopedObject qmlScopeObject(scope, QV4::QmlContextWrapper::qmlScope(ep->v8engine(), ctxt, qmlScope));

329

329

QV4::Script script(v4, qmlScopeObject, code, filename, line);

330

330

331

QV4::ScopedValue result(scope);

331

332

script.parse();

332

333

if (!v4->hasException)

Older »