forked from qt-creator/qt-creator
Debugger: Infrastructure for reworked native mixed debugging
- Remove old experimental native mixed approach. - Move some common stack parsing to Stackhandler. - Mark gdbbridge.py debug output explicitly to remove it from actual reponse handling New native mixed needs QtDeclarative changes and QTC_DEBUGGER_NATIVE_MIXED=1 for now. Change-Id: I09eed1da51cea878636d36756015b7bfaed34203 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
@@ -474,7 +474,6 @@ bool DummyEngine::hasCapability(unsigned cap) const
|
||||
return cap & (WatchpointByAddressCapability
|
||||
| BreakConditionCapability
|
||||
| TracePointCapability
|
||||
| OperateNativeMixed
|
||||
| OperateByInstructionCapability);
|
||||
|
||||
// This is a Qml or unknown engine.
|
||||
@@ -2321,17 +2320,6 @@ QMessageBox *showMessageBox(int icon, const QString &title,
|
||||
return mb;
|
||||
}
|
||||
|
||||
bool isNativeMixedEnabled()
|
||||
{
|
||||
static bool enabled = qEnvironmentVariableIsSet("QTC_DEBUGGER_NATIVE_MIXED");
|
||||
return enabled;
|
||||
}
|
||||
|
||||
bool isNativeMixedActive()
|
||||
{
|
||||
return isNativeMixedEnabled() && boolSetting(OperateNativeMixed);
|
||||
}
|
||||
|
||||
bool isReverseDebuggingEnabled()
|
||||
{
|
||||
static bool enabled = qEnvironmentVariableIsSet("QTC_DEBUGGER_ENABLE_REVERSE");
|
||||
@@ -2769,16 +2757,6 @@ void DebuggerPluginPrivate::extensionsInitialized()
|
||||
cmd->setAttribute(Command::CA_Hide);
|
||||
debugMenu->addAction(cmd);
|
||||
|
||||
if (isNativeMixedEnabled()) {
|
||||
SavedAction *act = action(OperateNativeMixed);
|
||||
act->setValue(true);
|
||||
cmd = ActionManager::registerAction(act, Constants::OPERATE_NATIVE_MIXED);
|
||||
cmd->setAttribute(Command::CA_Hide);
|
||||
debugMenu->addAction(cmd);
|
||||
connect(cmd->action(), &QAction::triggered,
|
||||
[this] { currentEngine()->updateAll(); });
|
||||
}
|
||||
|
||||
cmd = ActionManager::registerAction(m_breakAction, "Debugger.ToggleBreak");
|
||||
cmd->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? tr("F8") : tr("F9")));
|
||||
debugMenu->addAction(cmd);
|
||||
@@ -2912,8 +2890,6 @@ void DebuggerPluginPrivate::extensionsInitialized()
|
||||
hbox->addWidget(toolButton(Constants::STEPOUT));
|
||||
hbox->addWidget(toolButton(Constants::RESET));
|
||||
hbox->addWidget(toolButton(Constants::OPERATE_BY_INSTRUCTION));
|
||||
if (isNativeMixedEnabled())
|
||||
hbox->addWidget(toolButton(Constants::OPERATE_NATIVE_MIXED));
|
||||
|
||||
if (isReverseDebuggingEnabled()) {
|
||||
m_reverseToolButton = toolButton(Constants::REVERSE);
|
||||
|
||||
Reference in New Issue
Block a user