Commit c8e7df16 authored by dt's avatar dt
Browse files

Show a cancel button in the opening cmake projects wizard.



Allows the user to change his mind. :)
Reviewed-by: default avatarFriedemann Kleint <qtc-committer@nokia.com>
parent 1775f5d8
...@@ -85,7 +85,6 @@ CMakeOpenProjectWizard::CMakeOpenProjectWizard(CMakeManager *cmakeManager, const ...@@ -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 ...@@ -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();
} }
......
...@@ -648,7 +648,8 @@ bool CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader ...@@ -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 ...@@ -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());
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment