diff options
| -rw-r--r-- | src/corelib/io/qdir.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index af4d85552f..c58db6d8d8 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -68,9 +68,9 @@ QT_BEGIN_NAMESPACE +#if defined(Q_OS_WIN) static QString driveSpec(const QString &path) { -#if defined(Q_OS_WIN) if (path.size() < 2) return QString(); char c = path.at(0).toLatin1(); @@ -79,11 +79,8 @@ static QString driveSpec(const QString &path) if (path.at(1).toLatin1() != ':') return QString(); return path.mid(0, 2); -#else - Q_UNUSED(path); - return QString(); -#endif } +#endif //************* QDirPrivate QDirPrivate::QDirPrivate(const QString &path, const QStringList &nameFilters_, QDir::SortFlags sort_, QDir::Filters filters_) @@ -723,6 +720,7 @@ QString QDir::relativeFilePath(const QString &fileName) const if (isRelativePath(file) || isRelativePath(dir)) return file; +#ifdef Q_OS_WIN QString dirDrive = driveSpec(dir); QString fileDrive = driveSpec(file); @@ -732,18 +730,15 @@ QString QDir::relativeFilePath(const QString &fileName) const fileDriveMissing = true; } -#ifdef Q_OS_WIN if (fileDrive.toLower() != dirDrive.toLower() || (file.startsWith(QLatin1String("//")) && !dir.startsWith(QLatin1String("//")))) -#else - if (fileDrive != dirDrive) -#endif return file; dir.remove(0, dirDrive.size()); if (!fileDriveMissing) file.remove(0, fileDrive.size()); +#endif QString result; QStringList dirElts = dir.split(QLatin1Char('/'), QString::SkipEmptyParts); |