Commit 77afdb42 authored by hjk's avatar hjk
Browse files

debugger: in the qmldebugger, draw location marker _above_ breakpoints

parent 78b06e7c
...@@ -97,7 +97,6 @@ void QmlCppEnginePrivate::cppStackChanged() ...@@ -97,7 +97,6 @@ void QmlCppEnginePrivate::cppStackChanged()
foreach (const StackFrame &frame, m_cppEngine->stackHandler()->frames()) { foreach (const StackFrame &frame, m_cppEngine->stackHandler()->frames()) {
if (frame.function.endsWith(firstFunction)) if (frame.function.endsWith(firstFunction))
break; break;
qDebug() << firstFunction << frame.function;
frames.append(frame); frames.append(frame);
} }
int level = frames.size(); int level = frames.size();
......
...@@ -675,7 +675,7 @@ void QmlEngine::messageReceived(const QByteArray &message) ...@@ -675,7 +675,7 @@ void QmlEngine::messageReceived(const QByteArray &message)
stream >> command; stream >> command;
if (command == "STOPPED") { if (command == "STOPPED") {
qDebug() << command << this << state(); //qDebug() << command << this << state();
if (state() == InferiorRunOk) if (state() == InferiorRunOk)
notifyInferiorSpontaneousStop(); notifyInferiorSpontaneousStop();
...@@ -693,7 +693,6 @@ void QmlEngine::messageReceived(const QByteArray &message) ...@@ -693,7 +693,6 @@ void QmlEngine::messageReceived(const QByteArray &message)
for (int i = 0; i != stackFrames.size(); ++i) for (int i = 0; i != stackFrames.size(); ++i)
stackFrames[i].level = i + 1; stackFrames[i].level = i + 1;
gotoLocation(stackFrames.value(0));
stackHandler()->setFrames(stackFrames); stackHandler()->setFrames(stackFrames);
watchHandler()->beginCycle(); watchHandler()->beginCycle();
...@@ -773,6 +772,10 @@ void QmlEngine::messageReceived(const QByteArray &message) ...@@ -773,6 +772,10 @@ void QmlEngine::messageReceived(const QByteArray &message)
logMessage(LogReceive, logString); logMessage(LogReceive, logString);
} }
if (!stackFrames.isEmpty())
gotoLocation(stackFrames.value(0));
} else if (command == "RESULT") { } else if (command == "RESULT") {
WatchData data; WatchData data;
QByteArray iname; QByteArray iname;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment