[Cmake-commits] [cmake-commits] hoffman committed CMakeSetupDialog.cxx 1.40.2.8 1.40.2.9 QCMakeCacheView.cxx 1.26.2.4 1.26.2.5

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeSetupDialog.cxx QCMakeCacheView.cxx 
Log Message:
ENH: next RC


Index: CMakeSetupDialog.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetupDialog.cxx,v
retrieving revision 1.40.2.8
retrieving revision 1.40.2.9
diff -C 2 -d -r1.40.2.8 -r1.40.2.9
*** CMakeSetupDialog.cxx	31 Dec 2008 15:14:30 -0000	1.40.2.8
--- CMakeSetupDialog.cxx	31 Mar 2009 14:29:15 -0000	1.40.2.9
***************
*** 33,37 ****
  #include <QShortcut>
  #include <QMacInstallDialog.h>
! 
  #include "QCMake.h"
  #include "QCMakeCacheView.h"
--- 33,37 ----
  #include <QShortcut>
  #include <QMacInstallDialog.h>
! #include "cmVersion.h"
  #include "QCMake.h"
  #include "QCMakeCacheView.h"
***************
*** 674,678 ****
  void CMakeSetupDialog::doAbout()
  {
!   QString msg = "CMake\nwww.cmake.org";
  
    QDialog dialog;
--- 674,683 ----
  void CMakeSetupDialog::doAbout()
  {
!   QString msg = "CMake %1\n"
!                 "Using Qt %2\n"
!                 "www.cmake.org";
! 
!   msg = msg.arg(cmVersion::GetCMakeVersion().c_str());
!   msg = msg.arg(qVersion());
  
    QDialog dialog;

Index: QCMakeCacheView.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/QCMakeCacheView.cxx,v
retrieving revision 1.26.2.4
retrieving revision 1.26.2.5
diff -C 2 -d -r1.26.2.4 -r1.26.2.5
*** QCMakeCacheView.cxx	13 Jul 2008 21:55:25 -0000	1.26.2.4
--- QCMakeCacheView.cxx	31 Mar 2009 14:29:18 -0000	1.26.2.5
***************
*** 518,521 ****
--- 518,522 ----
      {
      f &= ~Qt::ItemIsEditable;
+     return f;
      }
    if(QCMakeProperty::BOOL == this->data(idx, TypeRole).toInt())