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>
(cherry picked from commit c8e7df16eb3949eddf0a167239ed9a4bb3a5e527)

diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
index f952675..d18b3fb 100644 (file)
--- 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 770ee84..a799cf7 100644 (file)
--- 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());
         }
     }