From 500a9959300796a5f39e128202b38c01f90bd3e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= <jedrzej.nowacki@nokia.com>
Date: Thu, 5 Jan 2012 15:16:26 +0100
Subject: [PATCH] Don't follow symlinks to directories.
Symlinks may create a directory loop, causing QtCreator to hang.
Change-Id: I701811bc2cc6d3c9efd8b51c1b80c7e5b4aa06ea
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
src/plugins/qt4projectmanager/qt4nodes.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index d6daf3e4a3e..02d1ea2899b 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -521,7 +521,7 @@ static QSet<Utils::FileName> recursiveEnumerate(const QString &folder)
dir.setFilter(dir.filter() | QDir::NoDotAndDotDot);
foreach (const QFileInfo &file, dir.entryInfoList()) {
- if (file.isDir())
+ if (file.isDir() && !file.isSymLink())
result += recursiveEnumerate(file.absoluteFilePath());
else
result += Utils::FileName(file);
--
GitLab