summaryrefslogtreecommitdiffstats
path: root/tests/auto/qfileinfo
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2012-01-18 13:01:57 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-01-18 17:07:00 (GMT)
commit25960ef75f7dd9bf78fae37177ab2cdbd825af9b (patch)
tree7d4d86adbdc0509048851bf800143f3e1612b66b /tests/auto/qfileinfo
parent4e7b29b6f4175c70e1aefad8216e80aae70f9099 (diff)
downloadQt-25960ef75f7dd9bf78fae37177ab2cdbd825af9b.zip
Qt-25960ef75f7dd9bf78fae37177ab2cdbd825af9b.tar.gz
Qt-25960ef75f7dd9bf78fae37177ab2cdbd825af9b.tar.bz2
Revert "fix NTFS mount points"
We agreed on treating neither junctions nor mount points as symlinks. This will be handled in another commit. This reverts commit 611eb9e5e5c8fe8035482e502b84263f43779dd8. Change-Id: I19f0bd841c7e6dd6e65e5c8df4bdfa1d6f08ce28 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'tests/auto/qfileinfo')
-rw-r--r--tests/auto/qfileinfo/tst_qfileinfo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp
index e36cc57..a8a510a 100644
--- a/tests/auto/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp
@@ -1463,7 +1463,7 @@ void tst_QFileInfo::ntfsJunctionPointsAndSymlinks_data()
junction = "mountpoint";
rootVolume.replace("\\\\?\\","\\??\\");
FileSystem::createNtfsJunction(rootVolume, junction);
- QTest::newRow("mountpoint") << junction << false << QString() << QFileInfo("mountpoint").canonicalFilePath();
+ QTest::newRow("mountpoint") << junction << true << QDir::fromNativeSeparators(rootPath) << QDir::rootPath();
}
}