BUG: Don't enable generate if configure completed with errors.

ENH:  Allow build w/ Qt configured with no STL support.

2 files changed, 3 insertions, 3 deletions

diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx
index 2bb470dfd0..1ed4943b7b 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -284,7 +284,7 @@ void CMakeSetupDialog::finishConfigure(int err)
       tr("Error in configuration process, project files may be invalid"), 
       QMessageBox::Ok);
     }
-  if(!this->CacheValues->cacheModel()->modifiedValues())
+  else if(!this->CacheValues->cacheModel()->modifiedValues())
     {
     this->setGenerateEnabled(true);
     }
diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx
index bfa5af9643..9d25170530 100644
--- a/Source/QtDialog/QCMake.cxx
+++ b/Source/QtDialog/QCMake.cxx
@@ -54,7 +54,7 @@ QCMake::QCMake(QObject* p)
   std::vector<std::string>::iterator iter;
   for(iter = generators.begin(); iter != generators.end(); ++iter)
     {
-    this->AvailableGenerators.append(QString::fromStdString(*iter));
+    this->AvailableGenerators.append(iter->c_str());
     }
 }
 
@@ -107,7 +107,7 @@ void QCMake::setBinaryDirectory(const QString& dir)
       const char* extraGen = cachem->GetCacheValue("CMAKE_EXTRA_GENERATOR");
       std::string curGen = cmExternalMakefileProjectGenerator::
                               CreateFullGeneratorName(itm.GetValue(), extraGen);
-      this->setGenerator(QString::fromStdString(curGen));
+      this->setGenerator(curGen.c_str());
       }
     }
 }