Commit 7c976602 authored by Kevin Funk's avatar Kevin Funk
Browse files

Push uncommitted parts of merge resolution

Sorry
parent e47c5e98
......@@ -89,8 +89,6 @@ GdbDebugger *DebugSession::createDebugger() const
}
void DebugSession::initializeDebugger()
connect(gdb, &GDB::debuggerInternalOutput, this,
&DebugSession::gdbInternalOutput);
{
//addCommand(new GDBCommand(GDBMI::EnableTimings, "yes"));
......@@ -122,11 +120,6 @@ void DebugSession::initializeDebugger()
addCommand(MI::NonMI, "source " + fileName);
}
if (m_testing) {
// GDB can't disable ASLR on CI server.
queueCmd(new GDBCommand(GDBMI::GdbSet, "disable-randomization off"));
}
qCDebug(DEBUGGERGDB) << "Initialized GDB";
}
......
......@@ -82,7 +82,6 @@ protected:
private Q_SLOTS:
void handleVersion(const QStringList& s);
void handleFileExecAndSymbols(const MI::ResultRecord& r);
void gdbInternalOutput (const QString& output);
private:
friend class GdbTest;
......
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