diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2013-08-22 13:44:49 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-22 14:42:11 +0200 |
| commit | da91b1c7312379ee18118059ee03faaf147a7d17 (patch) | |
| tree | b85ff48a6493329ec4a77dd694fc6f3000127001 /src/imports | |
| parent | 6d32ff7d891635982b54fd4db1946952ddb50b26 (diff) | |
TestLib: Fix regression in error location output
Error location returned should be given in the test file not in
TestCase.qml.
Change-Id: Ifea51fe5e39890a369c4dca6754abd46d2ee9bc2
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/testlib/main.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp index 81dcaa2fc3..6e4a397f4a 100644 --- a/src/imports/testlib/main.cpp +++ b/src/imports/testlib/main.cpp @@ -111,9 +111,9 @@ public Q_SLOTS: QQmlEngine *engine = qmlEngine(this); QV4::ExecutionEngine *v4 = QV8Engine::getV4(engine->handle()); - QVector<QV4::ExecutionEngine::StackFrame> stack = v4->stackTrace(frameIndex + 1); - if (stack.size() > frameIndex) - return QQmlV4Handle(QV4::Value::fromString(v4->newString(stack.at(frameIndex).source))); + 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))); return QQmlV4Handle(); } int callerLine(int frameIndex = 0) const @@ -121,9 +121,9 @@ public Q_SLOTS: QQmlEngine *engine = qmlEngine(this); QV4::ExecutionEngine *v4 = QV8Engine::getV4(engine->handle()); - QVector<QV4::ExecutionEngine::StackFrame> stack = v4->stackTrace(frameIndex + 1); - if (stack.size() > frameIndex) - return stack.at(frameIndex).line; + QVector<QV4::ExecutionEngine::StackFrame> stack = v4->stackTrace(frameIndex + 2); + if (stack.size() > frameIndex + 1) + return stack.at(frameIndex + 1).line; return -1; } }; |