Fixed resolving absolute paths in Symbian.

Fixed resolving absolute path using QFileInfo for paths that were
relative but contained the drive letter (e.g. "c:my.dll").

Absolute paths should now be properly cleaned in Symbian, too.

Task-number: 255326
Reviewed-by: Janne Anttila

1 files changed, 11 insertions, 3 deletions

diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp
index d951a86..076934c 100644
--- a/tests/auto/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp
@@ -411,6 +411,10 @@ void tst_QFileInfo::absolutePath_data()
     QString drivePrefix;
 #if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
     drivePrefix = QDir::currentPath().left(2);
+
+    // Make sure drive-relative paths return correct absolute paths (task 255326)
+    QTest::newRow("c:my.dll") << "c:my.dll" << QDir::currentPath() << "my.dll";
+    QTest::newRow("x:my.dll") << "x:my.dll" << "X:/" << "my.dll";
 #endif
     QTest::newRow("0") << "/machine/share/dir1/" << drivePrefix + "/machine/share/dir1" << "";
     QTest::newRow("1") << "/machine/share/dir1" << drivePrefix + "/machine/share" << "dir1";
@@ -449,6 +453,10 @@ void tst_QFileInfo::absFilePath_data()
     curr.remove(0, 2);   // Make it a absolute path with no drive specifier: \depot\qt-4.2\tests\auto\qfileinfo
     QTest::newRow(".")            << curr << QDir::currentPath();
     QTest::newRow("absFilePath") << "c:\\home\\andy\\tmp.txt" << "C:/home/andy/tmp.txt";
+
+    // Make sure drive-relative paths return correct absolute paths (task 255326)
+    QTest::newRow("c:my.dll") << "c:temp/my.dll" << QDir::currentPath() + "/temp/my.dll";
+    QTest::newRow("x:my.dll") << "x:temp/my.dll" << "X:/temp/my.dll";
 #else
     QTest::newRow("absFilePath") << "/home/andy/tmp.txt" << "/home/andy/tmp.txt";
 #endif
@@ -1052,19 +1060,19 @@ void tst_QFileInfo::isHidden_data()
         QFile file(hiddenFileName);
         if (file.open(QIODevice::WriteOnly)) {
             QTextStream t(&file);
-            t << "foobar";       
+            t << "foobar";
         } else {
             qWarning("Failed to create hidden file");
         }
         QFile file2(notHiddenFileName);
         if (file2.open(QIODevice::WriteOnly)) {
             QTextStream t(&file);
-            t << "foobar";       
+            t << "foobar";
         } else {
             qWarning("Failed to create non-hidden file");
         }
     }
-    
+
     RFs rfs;
     TInt err = rfs.Connect();
     if (err == KErrNone) {