From da91b1c7312379ee18118059ee03faaf147a7d17 Mon Sep 17 00:00:00 2001 From: Caroline Chao Date: Thu, 22 Aug 2013 13:44:49 +0200 Subject: 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 --- src/imports/testlib/main.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/imports') 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 stack = v4->stackTrace(frameIndex + 1); - if (stack.size() > frameIndex) - return QQmlV4Handle(QV4::Value::fromString(v4->newString(stack.at(frameIndex).source))); + QVector 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 stack = v4->stackTrace(frameIndex + 1); - if (stack.size() > frameIndex) - return stack.at(frameIndex).line; + QVector stack = v4->stackTrace(frameIndex + 2); + if (stack.size() > frameIndex + 1) + return stack.at(frameIndex + 1).line; return -1; } }; -- cgit v1.2.3