diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-08-12 12:18:48 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-08-12 12:18:48 (GMT) |
| commit | d658662e742b57f60908ba3d935b0870e12d8963 (patch) | |
| tree | 6819e6af527e2f11473b99c7efca48b9faf529a1 /tests/auto/qfileinfo | |
| parent | e4bb34d51cc9f4f78abc17a0e715876b11d53ace (diff) | |
| parent | 7a9b580030208a806897146b4c0f1d8f0d9caaa4 (diff) | |
| download | Qt-d658662e742b57f60908ba3d935b0870e12d8963.zip Qt-d658662e742b57f60908ba3d935b0870e12d8963.tar.gz Qt-d658662e742b57f60908ba3d935b0870e12d8963.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'tests/auto/qfileinfo')
| -rw-r--r-- | tests/auto/qfileinfo/tst_qfileinfo.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp index 9ef2c74..078ea07 100644 --- a/tests/auto/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp @@ -237,7 +237,6 @@ void tst_QFileInfo::copy() tst_QFileInfo::tst_QFileInfo() { - Q_SET_DEFAULT_IAP } void tst_QFileInfo::isFile_data() @@ -331,6 +330,9 @@ void tst_QFileInfo::isRoot_data() QTest::newRow("drive 1") << "c:" << false; QTest::newRow("drive 2") << "c:/" << true; QTest::newRow("drive 3") << "p:/" << false; +#endif + +#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) QTest::newRow("unc 1") << "//" + QtNetworkSettings::winServerName() << true; QTest::newRow("unc 2") << "//" + QtNetworkSettings::winServerName() + "/" << true; QTest::newRow("unc 3") << "//" + QtNetworkSettings::winServerName() + "/testshare" << false; @@ -485,6 +487,8 @@ void tst_QFileInfo::canonicalFilePath() QCOMPARE(info1.canonicalFilePath(), info2.canonicalFilePath()); } } +# if !defined(Q_OS_SYMBIAN) + // Symbian doesn't support links to directories { const QString link(QDir::tempPath() + QDir::separator() + "tst_qfileinfo"); QFile::remove(link); @@ -516,6 +520,7 @@ void tst_QFileInfo::canonicalFilePath() QCOMPARE(info1.canonicalFilePath(), info2.canonicalFilePath()); } } +# endif #endif } |