From c8e7df16eb3949eddf0a167239ed9a4bb3a5e527 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Tue, 3 Nov 2009 14:37:23 +0100
Subject: [PATCH] Show a cancel button in the opening cmake projects wizard.
Allows the user to change his mind. :)
Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com>
---
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp | 2 --
src/plugins/cmakeprojectmanager/cmakeproject.cpp | 6 ++++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
index f9526756e79..d18b3fb0ec8 100644
--- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
@@ -85,7 +85,6 @@ CMakeOpenProjectWizard::CMakeOpenProjectWizard(CMakeManager *cmakeManager, const
setPage(CMakeRunPageId, new CMakeRunPage(this));
setStartId(startid);
- setOption(QWizard::NoCancelButton);
init();
}
@@ -101,7 +100,6 @@ CMakeOpenProjectWizard::CMakeOpenProjectWizard(CMakeManager *cmakeManager, const
addPage(new CMakeRunPage(this, CMakeRunPage::Recreate, buildDirectory));
else
addPage(new CMakeRunPage(this, CMakeRunPage::Update, buildDirectory));
- setOption(QWizard::NoCancelButton);
init();
}
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 770ee8411fa..a799cf72657 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -648,7 +648,8 @@ bool CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader
// and the cmake command line
CMakeOpenProjectWizard copw(m_manager, sourceDirectory(), ProjectExplorer::Environment::systemEnvironment());
- copw.exec();
+ if (copw.exec() != QDialog::Accepted)
+ return false;
qDebug()<<"ccd.buildDirectory()"<<copw.buildDirectory();
@@ -690,7 +691,8 @@ bool CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader
buildDirectory(activeBC),
mode,
environment(activeBC));
- copw.exec();
+ if (copw.exec() != QDialog::Accepted)
+ return false;
activeBC->setValue("msvcVersion", copw.msvcVersion());
}
}
--
GitLab