forked from qt-creator/qt-creator
debugger: adjust to profile changes
This replaces the debugger command, sysroot and target abi fields with a profile id. Change-Id: I831c42ff8624fcfa520c2f28f6f06d73191b2680 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
@@ -32,12 +32,13 @@
|
||||
|
||||
#include "disassembleragent.h"
|
||||
|
||||
#include "disassemblerlines.h"
|
||||
#include "breakhandler.h"
|
||||
#include "debuggercore.h"
|
||||
#include "debuggerengine.h"
|
||||
#include "debuggerinternalconstants.h"
|
||||
#include "debuggercore.h"
|
||||
#include "debuggerstartparameters.h"
|
||||
#include "debuggerstringutils.h"
|
||||
#include "disassemblerlines.h"
|
||||
#include "stackframe.h"
|
||||
|
||||
#include <coreplugin/coreconstants.h>
|
||||
@@ -45,6 +46,8 @@
|
||||
#include <coreplugin/icore.h>
|
||||
#include <coreplugin/mimedatabase.h>
|
||||
|
||||
#include <projectexplorer/abi.h>
|
||||
|
||||
#include <texteditor/basetextdocument.h>
|
||||
#include <texteditor/basetexteditor.h>
|
||||
#include <texteditor/basetextmark.h>
|
||||
@@ -116,6 +119,7 @@ public:
|
||||
QList<ITextMark *> breakpointMarks;
|
||||
QList<CacheEntry> cache;
|
||||
QString mimeType;
|
||||
bool tryMixedInitialized;
|
||||
bool tryMixed;
|
||||
bool resetLocationScheduled;
|
||||
};
|
||||
@@ -124,6 +128,7 @@ DisassemblerAgentPrivate::DisassemblerAgentPrivate()
|
||||
: editor(0),
|
||||
locationMark(0),
|
||||
mimeType(_("text/x-qtcreator-generic-asm")),
|
||||
tryMixedInitialized(false),
|
||||
tryMixed(true),
|
||||
resetLocationScheduled(false)
|
||||
{
|
||||
@@ -214,6 +219,12 @@ const Location &DisassemblerAgent::location() const
|
||||
|
||||
bool DisassemblerAgent::isMixed() const
|
||||
{
|
||||
if (!d->tryMixedInitialized) {
|
||||
if (d->engine->startParameters().toolChainAbi.os() == ProjectExplorer::Abi::MacOS)
|
||||
d->tryMixed = false;
|
||||
d->tryMixedInitialized = true;
|
||||
}
|
||||
|
||||
return d->tryMixed
|
||||
&& d->location.lineNumber() > 0
|
||||
&& !d->location.functionName().isEmpty()
|
||||
@@ -406,10 +417,5 @@ quint64 DisassemblerAgent::address() const
|
||||
return d->location.address();
|
||||
}
|
||||
|
||||
void DisassemblerAgent::setTryMixed(bool on)
|
||||
{
|
||||
d->tryMixed = on;
|
||||
}
|
||||
|
||||
} // namespace Internal
|
||||
} // namespace Debugger
|
||||
|
||||
Reference in New Issue
Block a user