summaryrefslogtreecommitdiffstats
path: root/tests/auto/qdir
diff options
context:
space:
mode:
authorRitt Konstantin <ritt.ks@gmail.com>2010-01-29 12:12:39 (GMT)
committerJoão Abecasis <joao@trolltech.com>2010-01-29 12:12:39 (GMT)
commitc43400792b637c744ca840a4ecb339ffdb27c604 (patch)
tree8d03a7568d0b36f1bc6fddccfee5ed5a6292e0f3 /tests/auto/qdir
parent2964718224c0ed356511335742368d4fc421c6bd (diff)
downloadQt-c43400792b637c744ca840a4ecb339ffdb27c604.zip
Qt-c43400792b637c744ca840a4ecb339ffdb27c604.tar.gz
Qt-c43400792b637c744ca840a4ecb339ffdb27c604.tar.bz2
QDir::cleanPath: strip trailing slash for "/:/" on non-win platforms
Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
Diffstat (limited to 'tests/auto/qdir')
-rw-r--r--tests/auto/qdir/tst_qdir.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp
index c7f9b6b..1d909c9 100644
--- a/tests/auto/qdir/tst_qdir.cpp
+++ b/tests/auto/qdir/tst_qdir.cpp
@@ -982,6 +982,13 @@ tst_QDir::cleanPath_data()
QTest::newRow("data7") << ".//file1.txt" << "file1.txt";
QTest::newRow("data8") << "/foo/bar/..//file1.txt" << "/foo/file1.txt";
QTest::newRow("data9") << "//" << "/";
+#if !defined(Q_OS_WINCE)
+#if defined Q_OS_WIN
+ QTest::newRow("data10") << "c:\\" << "c:/";
+#else
+ QTest::newRow("data10") << "/:/" << "/:";
+#endif
+#endif
}