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

Simplify codepath

Browse Source 
Reviewed-by: dt
This commit is contained in:
Tobias Hunger
2010-02-02 12:03:50 +01:00
parent 5c651c9f2a
commit bc77bd9e78
1 changed files with 118 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -167,10 +167,16 @@ bool CMakeProject::parseCMakeLists()
CMakeCbpParser cbpparser;
// Parsing
//qDebug()<<"Parsing file "<<cbpFile;
if (cbpparser.parseCbpFile(cbpFile)) {
if (!cbpparser.parseCbpFile(cbpFile)) {
// TODO report error
qDebug()<<"Parsing failed";
// activeBC->updateToolChain(QString::null);
emit buildTargetsChanged();
return false;
}
// ToolChain
// activeBC->updateToolChain(cbpparser.compilerName());
m_projectName = cbpparser.projectName();
m_rootNode->setFolderName(cbpparser.projectName());
@@ -295,13 +301,7 @@ bool CMakeProject::parseCMakeLists()
removeRunConfiguration(rc);
}
//qDebug()<<"\n";
} else {
// TODO report error
qDebug()<<"Parsing failed";
// activeBC->updateToolChain(QString::null);
emit buildTargetsChanged();
return false;
}
emit buildTargetsChanged();
return true;
}