diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-24 12:13:42 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-26 09:05:19 +0200 |
| commit | a57085f00b146798a0cca0d52dfa127232c3e659 (patch) | |
| tree | 7b4df3f155d431aeb6f3aae01943a3411c812a7b /src/imports/testlib/main.cpp | |
| parent | 12fd2ccd3fa2dc0133b5a3fb89f9fdf5cf721232 (diff) | |
Fix API of QQmlV4Handle
Change-Id: Iac4a3fefebd33a5990408598486231a5add8e639
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/imports/testlib/main.cpp')
| -rw-r--r-- | src/imports/testlib/main.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp index 6e4a397f4a..47570afbda 100644 --- a/src/imports/testlib/main.cpp +++ b/src/imports/testlib/main.cpp @@ -99,7 +99,9 @@ public Q_SLOTS: QQmlEngine *engine = qmlEngine(this); QV4::ExecutionEngine *v4 = QV8Engine::getV4(engine->handle()); - return QQmlV4Handle(QV4::Value::fromString(v4->newString(name))); + QV4::Scope scope(v4); + QV4::ScopedValue s(scope, QV4::Value::fromString(v4->newString(name))); + return QQmlV4Handle(s); } bool compare(const QVariant& act, const QVariant& exp) const { @@ -110,10 +112,13 @@ public Q_SLOTS: { QQmlEngine *engine = qmlEngine(this); QV4::ExecutionEngine *v4 = QV8Engine::getV4(engine->handle()); + QV4::Scope scope(v4); QVector<QV4::ExecutionEngine::StackFrame> stack = v4->stackTrace(frameIndex + 2); - if (stack.size() > frameIndex + 1) - return QQmlV4Handle(QV4::Value::fromString(v4->newString(stack.at(frameIndex + 1).source))); + if (stack.size() > frameIndex + 1) { + QV4::ScopedValue s(scope, v4->newString(stack.at(frameIndex + 1).source)); + return QQmlV4Handle(s); + } return QQmlV4Handle(); } int callerLine(int frameIndex = 0) const |