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

Canceling the wizard for a new cmake build configuration still created.

Browse Source 
Made virtual newBuildConfiguration return a bool
This commit is contained in:
dt
2009-09-23 15:00:02 +02:00
parent 0f35338714
commit fba7d76936
10 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -114,6 +114,7 @@ void CMakeProject::slotActiveBuildConfiguration()
void CMakeProject::fileChanged(const QString &fileName)
{
Q_UNUSED(fileName)
if (m_insideFileChanged== true)
return;
m_insideFileChanged = true;
@@ -537,7 +538,7 @@ QList<ProjectExplorer::BuildConfigWidget*> CMakeProject::subConfigWidgets()
return list;
}
void CMakeProject::newBuildConfiguration(const QString &buildConfiguration)
bool CMakeProject::newBuildConfiguration(const QString &buildConfiguration)
{
// Default to all
if (targets().contains("all"))
@@ -548,7 +549,9 @@ QList<ProjectExplorer::BuildConfigWidget*> CMakeProject::subConfigWidgets()
setValue(buildConfiguration, "buildDirectory", copw.buildDirectory());
setValue(buildConfiguration, "msvcVersion", copw.msvcVersion());
parseCMakeLists();
return true;
}
return false;
}
ProjectExplorer::ProjectNode *CMakeProject::rootProjectNode() const