diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2010-09-17 14:05:04 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2010-09-20 14:46:16 (GMT) |
| commit | 63d50fdfa59cd198f7bf87f37770960e1b93945d (patch) | |
| tree | 29b80604ce487d14e1675e82f5220d57a3fbde23 /src/corelib/io/qfilesystementry.cpp | |
| parent | 768009af920c642834b1730136d9c8b156277c1d (diff) | |
| download | Qt-63d50fdfa59cd198f7bf87f37770960e1b93945d.zip Qt-63d50fdfa59cd198f7bf87f37770960e1b93945d.tar.gz Qt-63d50fdfa59cd198f7bf87f37770960e1b93945d.tar.bz2 | |
Move rootPath, homePath, tempPath, currentPath and setCurrentPath
Moved these functions inside the QFilesystemEngine and redirected the
QFSFileEngine copies.
Reviewed-By: joao
Diffstat (limited to 'src/corelib/io/qfilesystementry.cpp')
| -rw-r--r-- | src/corelib/io/qfilesystementry.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/corelib/io/qfilesystementry.cpp b/src/corelib/io/qfilesystementry.cpp index 10b59fd..12de135 100644 --- a/src/corelib/io/qfilesystementry.cpp +++ b/src/corelib/io/qfilesystementry.cpp @@ -121,8 +121,14 @@ QFileSystemEntry::NativePath QFileSystemEntry::nativeFilePath() const void QFileSystemEntry::resolveFilePath() const { if (m_filePath.isEmpty() && !m_nativeFilePath.isEmpty()) { -#ifdef QFILESYSTEMENTRY_NATIVE_PATH_IS_UTF16 +#if defined(QFILESYSTEMENTRY_NATIVE_PATH_IS_UTF16) m_filePath = QDir::fromNativeSeparators(m_nativeFilePath); +#ifdef Q_OS_WIN + if (m_filePath.startsWith(QLatin1String("//?/UNC/"))) + m_filePath = m_filePath.remove(2,6); + if (m_filePath.startsWith(QLatin1String("//?/"))) + m_filePath = m_filePath.remove(0,4); +#endif #else m_filePath = QDir::fromNativeSeparators(QFile::decodeName(m_nativeFilePath)); #endif |