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

Show a cancel button in the opening cmake projects wizard.

Browse Source 
Allows the user to change his mind. :)
Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com>
This commit is contained in:
dt
2009-11-03 14:37:23 +01:00
parent 1775f5d887
commit c8e7df16eb
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
View File

@@ -85,7 +85,6 @@ CMakeOpenProjectWizard::CMakeOpenProjectWizard(CMakeManager *cmakeManager, const
setPage(CMakeRunPageId, new CMakeRunPage(this)); setPage(CMakeRunPageId, new CMakeRunPage(this));
setStartId(startid); setStartId(startid);
setOption(QWizard::NoCancelButton);
init(); init();
} }
@@ -101,7 +100,6 @@ CMakeOpenProjectWizard::CMakeOpenProjectWizard(CMakeManager *cmakeManager, const
addPage(new CMakeRunPage(this, CMakeRunPage::Recreate, buildDirectory)); addPage(new CMakeRunPage(this, CMakeRunPage::Recreate, buildDirectory));
else else
addPage(new CMakeRunPage(this, CMakeRunPage::Update, buildDirectory)); addPage(new CMakeRunPage(this, CMakeRunPage::Update, buildDirectory));
setOption(QWizard::NoCancelButton);
init(); init();
} }

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

@@ -648,7 +648,8 @@ bool CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader
// and the cmake command line // and the cmake command line
CMakeOpenProjectWizard copw(m_manager, sourceDirectory(), ProjectExplorer::Environment::systemEnvironment()); CMakeOpenProjectWizard copw(m_manager, sourceDirectory(), ProjectExplorer::Environment::systemEnvironment());
copw.exec(); if (copw.exec() != QDialog::Accepted)
return false;
qDebug()<<"ccd.buildDirectory()"<<copw.buildDirectory(); qDebug()<<"ccd.buildDirectory()"<<copw.buildDirectory();
@@ -690,7 +691,8 @@ bool CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader
buildDirectory(activeBC), buildDirectory(activeBC),
mode, mode,
environment(activeBC)); environment(activeBC));
copw.exec(); if (copw.exec() != QDialog::Accepted)
return false;
activeBC->setValue("msvcVersion", copw.msvcVersion()); activeBC->setValue("msvcVersion", copw.msvcVersion());
} }
} }