[cmake-commits] clinton committed CMakeSetupDialog.cxx 1.16 1.17 QCMake.cxx 1.9 1.10

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/QtDialog
In directory public:/mounts/ram/cvs-serv19997

Modified Files:
	CMakeSetupDialog.cxx QCMake.cxx 
Log Message:
BUG:  Don't enable generate if configure completed with errors.
ENH:  Allow build w/ Qt configured with no STL support.


Index: CMakeSetupDialog.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetupDialog.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- CMakeSetupDialog.cxx	8 Nov 2007 15:17:37 -0000	1.16
+++ CMakeSetupDialog.cxx	8 Nov 2007 21:47:00 -0000	1.17
@@ -284,7 +284,7 @@
       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);
     }

Index: QCMake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/QCMake.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- QCMake.cxx	8 Nov 2007 15:17:37 -0000	1.9
+++ QCMake.cxx	8 Nov 2007 21:47:00 -0000	1.10
@@ -54,7 +54,7 @@
   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 @@
       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());
       }
     }
 }