Commit 278fa737 authored by dt's avatar dt

Fix build before run not working with debugging.

parent 64e6b49b
......@@ -1421,12 +1421,16 @@ void ProjectExplorerPlugin::debugProject()
if (!pro || m_debuggingRunControl )
return;
if (saveModifiedFiles(QList<Project *>() << pro)) {
m_runMode = ProjectExplorer::Constants::DEBUGMODE;
m_delayedRunConfiguration = pro->activeRunConfiguration();
//NBS TODO make the build project step take into account project dependencies
m_buildManager->buildProject(pro, pro->activeBuildConfiguration());
updateRunAction();
if (m_projectExplorerSettings.buildBeforeRun) {
if (saveModifiedFiles(QList<Project *>() << pro)) {
m_runMode = ProjectExplorer::Constants::DEBUGMODE;
m_delayedRunConfiguration = pro->activeRunConfiguration();
//NBS TODO make the build project step take into account project dependencies
m_buildManager->buildProject(pro, pro->activeBuildConfiguration());
updateRunAction();
}
} else {
executeRunConfiguration(pro->activeRunConfiguration(), ProjectExplorer::Constants::DEBUGMODE);
}
}
......
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