From dea7e36a1323af45cad46972c366f9cfc2619f7a Mon Sep 17 00:00:00 2001 From: con <qtc-committer@nokia.com> Date: Mon, 31 Aug 2009 12:30:54 +0200 Subject: [PATCH] Don't follow symbolic links in the file system view. If you double-click on a file, this file should be opened, not its link target. --- src/plugins/projectexplorer/foldernavigationwidget.cpp | 1 + tests/manual/filesystemview/symbolic_links/11111 | 0 tests/manual/filesystemview/symbolic_links/22222 | 0 tests/manual/filesystemview/symbolic_links/README | 2 ++ tests/manual/filesystemview/symbolic_links/symbolic.pro | 4 ++++ .../filesystemview/symbolic_links/symbolic_link_one.cpp | 1 + .../filesystemview/symbolic_links/symbolic_link_two.cpp | 1 + 7 files changed, 9 insertions(+) create mode 100644 tests/manual/filesystemview/symbolic_links/11111 create mode 100644 tests/manual/filesystemview/symbolic_links/22222 create mode 100644 tests/manual/filesystemview/symbolic_links/README create mode 100644 tests/manual/filesystemview/symbolic_links/symbolic.pro create mode 120000 tests/manual/filesystemview/symbolic_links/symbolic_link_one.cpp create mode 120000 tests/manual/filesystemview/symbolic_links/symbolic_link_two.cpp diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp index 993b6328209..53e5a0f4075 100644 --- a/src/plugins/projectexplorer/foldernavigationwidget.cpp +++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp @@ -79,6 +79,7 @@ FolderNavigationWidget::FolderNavigationWidget(QWidget *parent) m_title(new QLabel(this)), m_autoSync(false) { + m_dirModel->setResolveSymlinks(false); m_dirModel->setFilter(QDir::Dirs | QDir::Files | QDir::Drives | QDir::Readable | QDir::Writable | QDir::Executable | QDir::Hidden); m_dirModel->setSorting(QDir::Name | QDir::DirsFirst); diff --git a/tests/manual/filesystemview/symbolic_links/11111 b/tests/manual/filesystemview/symbolic_links/11111 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/manual/filesystemview/symbolic_links/22222 b/tests/manual/filesystemview/symbolic_links/22222 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/manual/filesystemview/symbolic_links/README b/tests/manual/filesystemview/symbolic_links/README new file mode 100644 index 00000000000..fab4914d12e --- /dev/null +++ b/tests/manual/filesystemview/symbolic_links/README @@ -0,0 +1,2 @@ +Interesting to test is e.g. +* if opening one of the symbolic links opens the link target (bad), or the symbolic link (good) diff --git a/tests/manual/filesystemview/symbolic_links/symbolic.pro b/tests/manual/filesystemview/symbolic_links/symbolic.pro new file mode 100644 index 00000000000..6de078744df --- /dev/null +++ b/tests/manual/filesystemview/symbolic_links/symbolic.pro @@ -0,0 +1,4 @@ +TEMPLATE = app +TARGET = symbolic + +SOURCES += symbolic_link_one.cpp symbolic_link_two.cpp diff --git a/tests/manual/filesystemview/symbolic_links/symbolic_link_one.cpp b/tests/manual/filesystemview/symbolic_links/symbolic_link_one.cpp new file mode 120000 index 00000000000..56b6510f1d6 --- /dev/null +++ b/tests/manual/filesystemview/symbolic_links/symbolic_link_one.cpp @@ -0,0 +1 @@ +11111 \ No newline at end of file diff --git a/tests/manual/filesystemview/symbolic_links/symbolic_link_two.cpp b/tests/manual/filesystemview/symbolic_links/symbolic_link_two.cpp new file mode 120000 index 00000000000..7b4353a26b6 --- /dev/null +++ b/tests/manual/filesystemview/symbolic_links/symbolic_link_two.cpp @@ -0,0 +1 @@ +22222 \ No newline at end of file -- GitLab