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

Unbreak the cmake plugin for the 1.2 release

Browse Source 
Last minute show stopper bug, this only affects cmake projects, so it
should be safe.

Reviewed-By: Trust me
This commit is contained in:
dt
2009-06-17 11:56:49 +02:00
parent 2919c21007
commit 3c6bb2429a
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,12 +72,6 @@ CMakeProject::CMakeProject(CMakeManager *manager, const QString &fileName)
m_insideFileChanged(false) m_insideFileChanged(false)
{ {
m_file = new CMakeFile(this, fileName); m_file = new CMakeFile(this, fileName);
m_watcher = new ProjectExplorer::FileWatcher(this);
connect(m_watcher, SIGNAL(fileChanged(QString)), this, SLOT(fileChanged(QString)));
m_watcher->addFile(fileName);
connect(this, SIGNAL(activeBuildConfigurationChanged()),
this, SLOT(slotActiveBuildConfiguration()));
} }
CMakeProject::~CMakeProject() CMakeProject::~CMakeProject()
@@ -567,7 +561,6 @@ void CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader
insertBuildStep(0, makeStep); insertBuildStep(0, makeStep);
addBuildConfiguration("all"); addBuildConfiguration("all");
setActiveBuildConfiguration("all");
makeStep->setBuildTarget("all", "all", true); makeStep->setBuildTarget("all", "all", true);
if (!copw.buildDirectory().isEmpty()) if (!copw.buildDirectory().isEmpty())
setValue("all", "buildDirectory", copw.buildDirectory()); setValue("all", "buildDirectory", copw.buildDirectory());
@@ -576,6 +569,8 @@ void CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader
MakeStep *cleanMakeStep = new MakeStep(this); MakeStep *cleanMakeStep = new MakeStep(this);
insertCleanStep(0, cleanMakeStep); insertCleanStep(0, cleanMakeStep);
cleanMakeStep->setValue("clean", true); cleanMakeStep->setValue("clean", true);
setActiveBuildConfiguration("all");
} else { } else {
// We have a user file, but we could still be missing the cbp file // We have a user file, but we could still be missing the cbp file
// or simply run createXml with the saved settings // or simply run createXml with the saved settings
@@ -600,8 +595,14 @@ void CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader
copw.exec(); copw.exec();
} }
} }
parseCMakeLists(); // Gets the directory from the active buildconfiguration parseCMakeLists(); // Gets the directory from the active buildconfiguration
m_watcher = new ProjectExplorer::FileWatcher(this);
connect(m_watcher, SIGNAL(fileChanged(QString)), this, SLOT(fileChanged(QString)));
m_watcher->addFile(m_fileName);
connect(this, SIGNAL(activeBuildConfigurationChanged()),
this, SLOT(slotActiveBuildConfiguration()));
} }
CMakeTarget CMakeProject::targetForTitle(const QString &title) CMakeTarget CMakeProject::targetForTitle(const QString &title)