From 49d1b068987d0895b2429b3d87beb561d9fbcbd7 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 18 Jan 2012 14:44:42 +0100 Subject: Revert "fix NTFS mount points" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We agreed on treating neither junctions nor mount points as symlinks. This will be handled in another commit. This reverts commit 1656c4780cc6c1d96f47522046f3f53b1eebb95a. Change-Id: I41a87b6df9f7fba333df4c967ee9f0c1f3940952 Reviewed-by: João Abecasis --- src/corelib/io/qfilesystemengine_win.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/corelib/io/qfilesystemengine_win.cpp') diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp index 4d56739483..d724429f6b 100644 --- a/src/corelib/io/qfilesystemengine_win.cpp +++ b/src/corelib/io/qfilesystemengine_win.cpp @@ -792,10 +792,9 @@ static bool tryFindFallback(const QFileSystemEntry &fname, QFileSystemMetaData & int errorCode = GetLastError(); if (errorCode == ERROR_ACCESS_DENIED || errorCode == ERROR_SHARING_VIOLATION) { WIN32_FIND_DATA findData; - const QString nativeFilePath = fname.nativeFilePath(); - if (getFindData(nativeFilePath, findData) + if (getFindData(fname.nativeFilePath(), findData) && findData.dwFileAttributes != INVALID_FILE_ATTRIBUTES) { - data.fillFromFindData(findData, true, fname.isDriveRoot(), nativeFilePath); + data.fillFromFindData(findData, true, fname.isDriveRoot()); filledData = true; } } @@ -876,9 +875,8 @@ bool QFileSystemEngine::fillMetaData(const QFileSystemEntry &entry, QFileSystemM data.knownFlagsMask |= QFileSystemMetaData::LinkType; if (data.fileAttribute_ & FILE_ATTRIBUTE_REPARSE_POINT) { WIN32_FIND_DATA findData; - const QString nativeFilePath = fname.nativeFilePath(); - if (getFindData(nativeFilePath, findData)) - data.fillFromFindData(findData, true, false, nativeFilePath); + if (getFindData(fname.nativeFilePath(), findData)) + data.fillFromFindData(findData, true); } } data.knownFlagsMask |= what; -- cgit v1.2.3