forked from qt-creator/qt-creator
Allow restoreSettings() to fail,
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:
@@ -110,7 +110,7 @@ public:
|
||||
|
||||
protected:
|
||||
virtual void saveSettingsImpl(ProjectExplorer::PersistentSettingsWriter &writer);
|
||||
virtual void restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader &reader);
|
||||
virtual bool restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader &reader);
|
||||
|
||||
// called by CMakeBuildSettingsWidget
|
||||
void changeBuildDirectory(const QString &buildConfiguration, const QString &newBuildDirectory);
|
||||
@@ -120,7 +120,7 @@ private slots:
|
||||
void slotActiveBuildConfiguration();
|
||||
|
||||
private:
|
||||
void parseCMakeLists();
|
||||
bool parseCMakeLists();
|
||||
void updateToolChain(const QString &compiler);
|
||||
|
||||
void buildTree(CMakeProjectNode *rootNode, QList<ProjectExplorer::FileNode *> list);
|
||||
|
||||
Reference in New Issue
Block a user