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

Allow restoreSettings() to fail,

Browse Source 
E.g. cmake pops up a wizard then, the running of cmake can fail though.
Now you don't end i[ with a empty project then. The error reporting in
that case is not yet optimal.
This commit is contained in:
dt
2009-07-03 16:46:01 +02:00
parent 5a8b61b2ee
commit e524f52477
11 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -468,7 +468,7 @@ GenericMakeStep *GenericProject::makeStep() const
return 0;
}
void GenericProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader &reader)
bool GenericProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader &reader)
{
Project::restoreSettingsImpl(reader);
@@ -500,6 +500,7 @@ void GenericProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsRead
setIncludePaths(allIncludePaths());
refresh(Everything);
return true;
}
void GenericProject::saveSettingsImpl(ProjectExplorer::PersistentSettingsWriter &writer)