[Cmake-commits] [cmake-commits] hoffman committed QMacInstallDialog.cxx 1.1.2.1 1.1.2.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Apr 23 12:14:35 EDT 2008
Update of /cvsroot/CMake/CMake/Source/QtDialog
In directory public:/mounts/ram/cvs-serv4778/Source/QtDialog
Modified Files:
Tag: CMake-2-6
QMacInstallDialog.cxx
Log Message:
ENH: merge in some fixes from head
Index: QMacInstallDialog.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/QMacInstallDialog.cxx,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C 2 -d -r1.1.2.1 -r1.1.2.2
*** QMacInstallDialog.cxx 8 Apr 2008 16:22:51 -0000 1.1.2.1
--- QMacInstallDialog.cxx 23 Apr 2008 16:14:33 -0000 1.1.2.2
***************
*** 70,79 ****
{
std::cout << "rm [" << newName << "]\n";
! cmSystemTools::RemoveFile(newName.c_str());
}
std::cout << "ln -s [" << file << "] [";
std::cout << newName << "]\n";
! cmSystemTools::CreateSymlink(file.c_str(),
! newName.c_str());
}
this->done(0);
--- 70,105 ----
{
std::cout << "rm [" << newName << "]\n";
! if(!cmSystemTools::RemoveFile(newName.c_str()))
! {
! QString message = tr("Failed to remove file "
! "installation may be incomplete: ");
! message += newName.c_str();
! QString title = tr("Error Removing file");
! QMessageBox::StandardButton btn =
! QMessageBox::critical(this, title, message,
! QMessageBox::Ok|QMessageBox::Abort);
! if(btn == QMessageBox::Abort)
! {
! return;
! }
! }
}
std::cout << "ln -s [" << file << "] [";
std::cout << newName << "]\n";
! if(!cmSystemTools::CreateSymlink(file.c_str(),
! newName.c_str()))
! {
! QString message = tr("Failed create symlink "
! "installation may be incomplete: ");
! message += newName.c_str();
! QString title = tr("Error Creating Symlink");
! QMessageBox::StandardButton btn =
! QMessageBox::critical(this, title, message,
! QMessageBox::Ok|QMessageBox::Abort);
! if(btn == QMessageBox::Abort)
! {
! return;
! }
! }
}
this->done(0);
More information about the Cmake-commits
mailing list