diff options
| -rw-r--r-- | src/qml/compiler/qv4codegen.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/tst_qqmldebugjs.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp index 8f6863b5d8..706f211ae0 100644 --- a/src/qml/compiler/qv4codegen.cpp +++ b/src/qml/compiler/qv4codegen.cpp @@ -2126,6 +2126,7 @@ int Codegen::defineFunction(const QString &name, AST::Node *ast, sourceElements(body); if (hasError || !endsWithReturn(body)) { + bytecodeGenerator->setLocation(ast->lastSourceLocation()); if (requiresReturnValue) { if (_returnAddress >= 0) { Instruction::LoadReg load; diff --git a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/tst_qqmldebugjs.cpp b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/tst_qqmldebugjs.cpp index 8a96afc7d7..8e9b0e3671 100644 --- a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/tst_qqmldebugjs.cpp +++ b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/tst_qqmldebugjs.cpp @@ -924,7 +924,6 @@ void tst_QQmlDebugJS::setBreakpointInScriptOnTimerCallback() void tst_QQmlDebugJS::setBreakpointInScriptInDifferentFile() { - QSKIP("fixme"); //void setBreakpoint(QString type, QString target, int line = -1, int column = -1, bool enabled = false, QString condition = QString(), int ignoreCount = -1) QFETCH(bool, qmlscene); QFETCH(bool, redundantRefs); |