From 77afdb42af1706c9c553568d99b34a22eac5c7a2 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 19 Jan 2011 18:53:04 +0100
Subject: [PATCH] debugger: in the qmldebugger, draw location marker _above_
 breakpoints

---
 src/plugins/debugger/qml/qmlcppengine.cpp | 1 -
 src/plugins/debugger/qml/qmlengine.cpp    | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index ccbe396e33a..dc6767e7de9 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -97,7 +97,6 @@ void QmlCppEnginePrivate::cppStackChanged()
     foreach (const StackFrame &frame, m_cppEngine->stackHandler()->frames()) {
         if (frame.function.endsWith(firstFunction))
             break;
-        qDebug() << firstFunction << frame.function;
         frames.append(frame);
     }
     int level = frames.size();
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 4d5ecc8b817..6243a23d342 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -675,7 +675,7 @@ void QmlEngine::messageReceived(const QByteArray &message)
     stream >> command;
 
     if (command == "STOPPED") {
-        qDebug() << command << this << state();
+        //qDebug() << command << this << state();
         if (state() == InferiorRunOk)
             notifyInferiorSpontaneousStop();
 
@@ -693,7 +693,6 @@ void QmlEngine::messageReceived(const QByteArray &message)
         for (int i = 0; i != stackFrames.size(); ++i)
             stackFrames[i].level = i + 1;
 
-        gotoLocation(stackFrames.value(0));
         stackHandler()->setFrames(stackFrames);
 
         watchHandler()->beginCycle();
@@ -773,6 +772,10 @@ void QmlEngine::messageReceived(const QByteArray &message)
 
             logMessage(LogReceive, logString);
         }
+
+        if (!stackFrames.isEmpty())
+            gotoLocation(stackFrames.value(0));
+
     } else if (command == "RESULT") {
         WatchData data;
         QByteArray iname;