[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1623-ge083dc3

[Clinton Stimpson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e083dc3056b6fb79b1a42f1a3b72f83dd87bd037 (commit)
       via  480be00bfac0af72d373b5ef190ebc770a1bc7c1 (commit)
      from  5578277ae0b2856066c17aa25a87e144fbac64bc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e083dc3056b6fb79b1a42f1a3b72f83dd87bd037
commit e083dc3056b6fb79b1a42f1a3b72f83dd87bd037
Merge: 5578277 480be00
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Mar 31 09:15:33 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 31 09:15:33 2014 -0400

    Merge topic 'cmake-gui-symlinks' into next
    
    480be00b cmake-gui: Don't resolve symlinks with using file dialog.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=480be00bfac0af72d373b5ef190ebc770a1bc7c1
commit 480be00bfac0af72d373b5ef190ebc770a1bc7c1
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Sat Mar 29 22:39:43 2014 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Sat Mar 29 22:41:44 2014 -0600

    cmake-gui: Don't resolve symlinks with using file dialog.
    
    This fixes bug #14274 where a clang++ symlink was resolved to
    a clang executable.

diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx
index f62afd6..1a98cea 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -578,7 +578,8 @@ void CMakeSetupDialog::doInterrupt()
 void CMakeSetupDialog::doSourceBrowse()
 {
   QString dir = QFileDialog::getExistingDirectory(this,
-    tr("Enter Path to Source"), this->SourceDirectory->text());
+    tr("Enter Path to Source"), this->SourceDirectory->text(),
+    QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
   if(!dir.isEmpty())
     {
     this->setSourceDirectory(dir);
@@ -608,7 +609,8 @@ void CMakeSetupDialog::updateBinaryDirectory(const QString& dir)
 void CMakeSetupDialog::doBinaryBrowse()
 {
   QString dir = QFileDialog::getExistingDirectory(this,
-    tr("Enter Path to Build"), this->BinaryDirectory->currentText());
+    tr("Enter Path to Build"), this->BinaryDirectory->currentText(),
+    QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
   if(!dir.isEmpty() && dir != this->BinaryDirectory->currentText())
     {
     this->setBinaryDirectory(dir);
diff --git a/Source/QtDialog/QCMakeWidgets.cxx b/Source/QtDialog/QCMakeWidgets.cxx
index a0c5e17..41f98b5 100644
--- a/Source/QtDialog/QCMakeWidgets.cxx
+++ b/Source/QtDialog/QCMakeWidgets.cxx
@@ -67,7 +67,8 @@ void QCMakeFilePathEditor::chooseFile()
     title = title.arg(this->Variable);
     }
   this->fileDialogExists(true);
-  path = QFileDialog::getOpenFileName(this, title, info.absolutePath());
+  path = QFileDialog::getOpenFileName(this, title, info.absolutePath(),
+    QString(), NULL, QFileDialog::DontResolveSymlinks);
   this->fileDialogExists(false);
 
   if(!path.isEmpty())
@@ -91,7 +92,8 @@ void QCMakePathEditor::chooseFile()
     title = title.arg(this->Variable);
     }
   this->fileDialogExists(true);
-  path = QFileDialog::getExistingDirectory(this, title, this->text());
+  path = QFileDialog::getExistingDirectory(this, title, this->text(),
+    QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
   this->fileDialogExists(false);
   if(!path.isEmpty())
     {

-----------------------------------------------------------------------

Summary of changes:
 Source/QtDialog/CMakeSetupDialog.cxx |    6 ++++--
 Source/QtDialog/QCMakeWidgets.cxx    |    6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake