forked from qt-creator/qt-creator
Debugger: Simplify raise-on-stop logic
Also slightly change meaning (now all stops may cause raising). Change-Id: Ie3fee7371ab119e4e9747dc44a4d8ef2cd62c8d8 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
@@ -29,7 +29,6 @@
|
||||
|
||||
#include "debuggermainwindow.h"
|
||||
#include "debuggercore.h"
|
||||
#include "debuggerengine.h"
|
||||
#include "debuggerrunconfigurationaspect.h"
|
||||
|
||||
#include <utils/appmainwindow.h>
|
||||
@@ -131,8 +130,6 @@ public:
|
||||
Project *m_previousProject;
|
||||
Target *m_previousTarget;
|
||||
RunConfiguration *m_previousRunConfiguration;
|
||||
|
||||
DebuggerEngine *m_engine;
|
||||
};
|
||||
|
||||
DebuggerMainWindowPrivate::DebuggerMainWindowPrivate(DebuggerMainWindow *mw)
|
||||
@@ -150,7 +147,6 @@ DebuggerMainWindowPrivate::DebuggerMainWindowPrivate(DebuggerMainWindow *mw)
|
||||
, m_previousProject(0)
|
||||
, m_previousTarget(0)
|
||||
, m_previousRunConfiguration(0)
|
||||
, m_engine(0)
|
||||
{
|
||||
m_debugToolBarLayout->setMargin(0);
|
||||
m_debugToolBarLayout->setSpacing(0);
|
||||
@@ -266,15 +262,6 @@ DebuggerMainWindow::~DebuggerMainWindow()
|
||||
delete d;
|
||||
}
|
||||
|
||||
void DebuggerMainWindow::setCurrentEngine(DebuggerEngine *engine)
|
||||
{
|
||||
if (d->m_engine)
|
||||
disconnect(d->m_engine, SIGNAL(raiseWindow()), ICore::mainWindow(), SLOT(raiseWindow()));
|
||||
d->m_engine = engine;
|
||||
if (d->m_engine)
|
||||
connect(d->m_engine, SIGNAL(raiseWindow()), ICore::mainWindow(), SLOT(raiseWindow()));
|
||||
}
|
||||
|
||||
DebuggerLanguages DebuggerMainWindow::activeDebugLanguages() const
|
||||
{
|
||||
return d->m_activeDebugLanguages;
|
||||
|
||||
Reference in New Issue
Block a user