feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.4'

Browse Source 
Change-Id: I9ab2c68d2bd07b0dd89051a2f5f6fa51676d8594
This commit is contained in:
Orgad Shaneh
2017-08-30 01:03:20 +03:00
parent 5ad44318eb a5625f2f9d
commit 139792ee25
92 changed files with 261 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/utils/fileutils.cpp
View File

@@ -210,7 +210,9 @@ bool FileUtils::isFileNewerThan(const FileName &filePath, const QDateTime &timeS
/*!
Recursively resolves symlinks if \a filePath is a symlink.
To resolve symlinks anywhere in the path, see canonicalPath
To resolve symlinks anywhere in the path, see canonicalPath.
Unlike QFileInfo::canonicalFilePath(), this function will still return the expected deepest
target file even if the symlink is dangling.
\note Maximum recursion depth == 16.
@@ -221,7 +223,7 @@ FileName FileUtils::resolveSymlinks(const FileName &path)
QFileInfo f = path.toFileInfo();
int links = 16;
while (links-- && f.isSymLink())
f.setFile(f.symLinkTarget());
f.setFile(f.dir(), f.symLinkTarget());
if (links <= 0)
return FileName();
return FileName::fromString(f.filePath());
@@ -613,7 +615,7 @@ QString FileName::fileName(int pathComponents) const
/// FileName exists.
bool FileName::exists() const
{
return QFileInfo::exists(*this);
return !isEmpty() && QFileInfo::exists(*this);
}
/// Find the parent directory of a given directory.