diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-25 08:51:44 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-25 08:51:44 (GMT) |
| commit | 8cee5b06aa0ecde7ba0a53c8a46070af3691db1b (patch) | |
| tree | 4cd7f5ffb8b31af78f095c40fa6021a0331fde3b /tests | |
| parent | f729015e1f44065b1b1911b65ba3fddd35d5545b (diff) | |
| parent | f049061a7b479c957240ec8e4fd91d1e9463b071 (diff) | |
| download | Qt-8cee5b06aa0ecde7ba0a53c8a46070af3691db1b.zip Qt-8cee5b06aa0ecde7ba0a53c8a46070af3691db1b.tar.gz Qt-8cee5b06aa0ecde7ba0a53c8a46070af3691db1b.tar.bz2 | |
Merge commit 'origin/master' into 4.6
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qdir/tst_qdir.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp index 13e8c95..c00ca7a 100644 --- a/tests/auto/qdir/tst_qdir.cpp +++ b/tests/auto/qdir/tst_qdir.cpp @@ -1262,7 +1262,7 @@ void tst_QDir::homePath() #ifdef Q_OS_UNIX if (strHome.length() > 1) // root dir = "/" QVERIFY(!strHome.endsWith('/')); -#elif defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) +#elif defined(Q_OS_WIN) if (strHome.length() > 3) // root dir = "c:/"; "//" is not really valid... QVERIFY(!strHome.endsWith('/')); #endif @@ -1286,7 +1286,7 @@ void tst_QDir::tempPath() #ifdef Q_OS_UNIX if (path.length() > 1) // root dir = "/" QVERIFY(!path.endsWith('/')); -#elif defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) +#elif defined(Q_OS_WIN) if (path.length() > 3) // root dir = "c:/"; "//" is not really valid... QVERIFY(!path.endsWith('/')); #endif |