feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/12.0'

Browse Source 
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp

Change-Id: If96d0f0a3d48c2581e765e4afb8b23924c48bdd6
This commit is contained in:
Eike Ziller
2023-12-12 10:17:39 +01:00
parent 27ef041d28 c4464eb072
commit 10e5a27c27
10 changed files with 93 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -1232,13 +1232,15 @@ void DebuggerPluginPrivate::createDapDebuggerPerspective(QWidget *globalLogWindo
{
QString name;
char const *runMode;
bool forceSkipDeploy = false;
};
const QList<DapPerspective> perspectiveList = {
DapPerspective{Tr::tr("CMake Preset"), ProjectExplorer::Constants::DAP_CMAKE_DEBUG_RUN_MODE},
DapPerspective{Tr::tr("CMake Preset"),
ProjectExplorer::Constants::DAP_CMAKE_DEBUG_RUN_MODE,
/*forceSkipDeploy=*/true},
DapPerspective{Tr::tr("GDB Preset"), ProjectExplorer::Constants::DAP_GDB_DEBUG_RUN_MODE},
DapPerspective{Tr::tr("Python Preset"),
ProjectExplorer::Constants::DAP_PY_DEBUG_RUN_MODE},
DapPerspective{Tr::tr("Python Preset"), ProjectExplorer::Constants::DAP_PY_DEBUG_RUN_MODE},
};
for (const DapPerspective &dp : perspectiveList)
@@ -1246,10 +1248,11 @@ void DebuggerPluginPrivate::createDapDebuggerPerspective(QWidget *globalLogWindo
connect(&m_startDapAction, &QAction::triggered, this, [perspectiveList] {
QComboBox *combo = qobject_cast<QComboBox *>(EngineManager::dapEngineChooser());
if (perspectiveList.size() > combo->currentIndex())
ProjectExplorerPlugin::runStartupProject(perspectiveList.at(combo->currentIndex())
.runMode,
false);
if (perspectiveList.size() > combo->currentIndex()) {
const DapPerspective dapPerspective = perspectiveList.at(combo->currentIndex());
ProjectExplorerPlugin::runStartupProject(dapPerspective.runMode,
dapPerspective.forceSkipDeploy);
}
});
auto breakpointManagerView = createBreakpointManagerView("DAPDebugger.BreakWindow");