[cmake-commits] clinton committed CMakeSetupDialog.cxx 1.36 1.37

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Feb 25 15:07:41 EST 2008


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

Modified Files:
	CMakeSetupDialog.cxx 
Log Message:

ENH:  Adjust when log is cleared.  Its kept doing generate, 
      and cleared when changing the source directory.
      #6358.



Index: CMakeSetupDialog.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetupDialog.cxx,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- CMakeSetupDialog.cxx	15 Feb 2008 00:58:31 -0000	1.36
+++ CMakeSetupDialog.cxx	25 Feb 2008 20:07:38 -0000	1.37
@@ -261,7 +261,6 @@
     
   this->enterState(Configuring);
 
-  this->Output->clear();
   this->CacheValues->selectionModel()->clear();
   QMetaObject::invokeMethod(this->CMakeThread->cmakeInstance(),
     "setProperties", Qt::QueuedConnection, 
@@ -437,6 +436,7 @@
 
 void CMakeSetupDialog::onSourceDirectoryChanged(const QString& dir)
 {
+  this->Output->clear();
   QMetaObject::invokeMethod(this->CMakeThread->cmakeInstance(),
     "setSourceDirectory", Qt::QueuedConnection, Q_ARG(QString, dir));
 }
@@ -765,7 +765,6 @@
   else if(s == Generating)
     {
     this->CacheModified = false;
-    this->Output->clear();
     this->setEnabledState(false);
     this->ConfigureButton->setEnabled(false);
     this->GenerateAction->setEnabled(false);



More information about the Cmake-commits mailing list