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

CMakeProject: Fix wrong slots

Browse Source 
We never noticed that we had run cmake

Reviewed-By: hunger
This commit is contained in:
dt
2011-04-13 13:10:30 +02:00
parent 8a276097c6
commit dd59a14936
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
View File

@@ -318,7 +318,7 @@ bool CMakeSettingsPage::isCMakeExecutableValid() const
{ {
if (m_userCmake.state == CMakeValidator::RUNNING) { if (m_userCmake.state == CMakeValidator::RUNNING) {
disconnect(m_userCmake.process, SIGNAL(finished(int)), disconnect(m_userCmake.process, SIGNAL(finished(int)),
this, SLOT(cmakeFinished())); this, SLOT(userCmakeFinished()));
m_userCmake.process->waitForFinished(); m_userCmake.process->waitForFinished();
// Parse the output now // Parse the output now
cmakeFinished(&m_userCmake); cmakeFinished(&m_userCmake);
@@ -328,7 +328,7 @@ bool CMakeSettingsPage::isCMakeExecutableValid() const
return true; return true;
if (m_pathCmake.state == CMakeValidator::RUNNING) { if (m_pathCmake.state == CMakeValidator::RUNNING) {
disconnect(m_userCmake.process, SIGNAL(finished(int)), disconnect(m_userCmake.process, SIGNAL(finished(int)),
this, SLOT(cmakeFinished())); this, SLOT(pathCmakeFinished()));
m_pathCmake.process->waitForFinished(); m_pathCmake.process->waitForFinished();
// Parse the output now // Parse the output now
cmakeFinished(&m_pathCmake); cmakeFinished(&m_pathCmake);