From ab0e0b1f97121c3bda86083d6cb59a02bbadbca3 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 7 Jul 2010 14:36:17 +0200
Subject: [PATCH] debugger: fix startup of pdbengine
---
src/plugins/debugger/pdb/pdbengine.cpp | 16 ++++++++--------
src/plugins/debugger/script/scriptengine.cpp | 5 +++--
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp
index e7b2ad96776..8edb629345c 100644
--- a/src/plugins/debugger/pdb/pdbengine.cpp
+++ b/src/plugins/debugger/pdb/pdbengine.cpp
@@ -140,6 +140,7 @@ void PdbEngine::exitDebugger()
void PdbEngine::startDebugger()
{
+ setState(EngineStarting);
setState(AdapterStarting);
m_scriptFileName = QFileInfo(startParameters().executable).absoluteFilePath();
@@ -151,11 +152,6 @@ void PdbEngine::startDebugger()
startFailed();
return;
}
- setState(AdapterStarted);
- setState(InferiorStarting);
- setState(InferiorRunningRequested);
- showStatusMessage(tr("Running requested..."), 5000);
-
m_pdbProc.disconnect(); // From any previous runs
m_pdb = _("/usr/bin/python");
@@ -196,9 +192,6 @@ void PdbEngine::startDebugger()
startFailed();
return;
}
-
- emit startSuccessful();
- setState(InferiorRunning);
attemptBreakpointSynchronization();
showMessage(_("PDB STARTED, INITIALIZING IT"));
@@ -206,6 +199,13 @@ void PdbEngine::startDebugger()
Core::ICore::instance()->resourcePath().toLocal8Bit() + "/gdbmacros/";
postCommand("execfile('" + dumperSourcePath + "pdumper.py')",
CB(handleLoadDumper));
+
+ setState(AdapterStarted);
+ setState(InferiorStarting);
+ setState(InferiorRunningRequested);
+ showStatusMessage(tr("Running requested..."), 5000);
+
+ emit startSuccessful();
}
void PdbEngine::runInferior()
diff --git a/src/plugins/debugger/script/scriptengine.cpp b/src/plugins/debugger/script/scriptengine.cpp
index 3a8c872436c..33021f018e4 100644
--- a/src/plugins/debugger/script/scriptengine.cpp
+++ b/src/plugins/debugger/script/scriptengine.cpp
@@ -34,6 +34,7 @@
#include "breakhandler.h"
#include "debuggerconstants.h"
#include "debuggerdialogs.h"
+#include "debuggerstringutils.h"
#include "moduleshandler.h"
#include "registerhandler.h"
#include "stackhandler.h"
@@ -230,7 +231,7 @@ void ScriptEngine::exitDebugger()
void ScriptEngine::startDebugger()
{
- qDebug() << "STARTING SCRIPT DEBUGGER";
+ showMessage(_("STARTING SCRIPT DEBUGGER"), LogMisc);
QTC_ASSERT(state() == DebuggerNotReady, setState(DebuggerNotReady));
setState(EngineStarting);
setState(AdapterStarting);
@@ -251,7 +252,7 @@ void ScriptEngine::startDebugger()
setState(InferiorStarting);
m_scriptFileName = QFileInfo(startParameters().executable).absoluteFilePath();
- qDebug() << "SCRIPT FILE: " << m_scriptFileName;
+ showMessage(_("SCRIPT FILE: ") + m_scriptFileName);
QFile scriptFile(m_scriptFileName);
if (!scriptFile.open(QIODevice::ReadOnly|QIODevice::Text)) {
showMessage(QString::fromLatin1("Cannot open %1: %2").
--
GitLab