aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcon <qtc-committer@nokia.com>2009-08-31 12:30:54 +0200
committercon <qtc-committer@nokia.com>2009-08-31 12:34:40 +0200
commitd40ba7eae19df11fe9721ce92f70ea68b4c5729d (patch)
tree7fe5be4fa7253ddcc0e4b6ad25b60049cf19095a
parentd35e02b8da13620b622f9e31a8cb1c972dbc7c0c (diff)
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. (cherry picked from commit dea7e36a1323af45cad46972c366f9cfc2619f7a)
-rw-r--r--src/plugins/projectexplorer/foldernavigationwidget.cpp1
-rw-r--r--tests/manual/filesystemview/symbolic_links/111110
-rw-r--r--tests/manual/filesystemview/symbolic_links/222220
-rw-r--r--tests/manual/filesystemview/symbolic_links/README2
-rw-r--r--tests/manual/filesystemview/symbolic_links/symbolic.pro4
l---------tests/manual/filesystemview/symbolic_links/symbolic_link_one.cpp1
l---------tests/manual/filesystemview/symbolic_links/symbolic_link_two.cpp1
7 files changed, 9 insertions, 0 deletions
diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp
index 993b632820..53e5a0f407 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 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/manual/filesystemview/symbolic_links/11111
diff --git a/tests/manual/filesystemview/symbolic_links/22222 b/tests/manual/filesystemview/symbolic_links/22222
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/manual/filesystemview/symbolic_links/22222
diff --git a/tests/manual/filesystemview/symbolic_links/README b/tests/manual/filesystemview/symbolic_links/README
new file mode 100644
index 0000000000..fab4914d12
--- /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 0000000000..6de078744d
--- /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 0000000000..56b6510f1d
--- /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 0000000000..7b4353a26b
--- /dev/null
+++ b/tests/manual/filesystemview/symbolic_links/symbolic_link_two.cpp
@@ -0,0 +1 @@
+22222 \ No newline at end of file