aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/tools
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2012-10-23 17:24:56 +0200
committerJoerg Bornemann <joerg.bornemann@digia.com>2012-10-23 17:55:44 +0200
commitbb83d1feac18f38e1004e04e79c425df11ea4448 (patch)
tree566e315565d2b4b4e2cac17e87c69b8d45763e2f /tests/auto/tools
parent4e980e0a9883f7f5c66a74feac517ed737369fe9 (diff)
Get rid of some Q_OS_* ifdefs.
Change-Id: Iec0c5f795fafc37ea15e3e1cf46b392f0c7b6375 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests/auto/tools')
-rw-r--r--tests/auto/tools/tst_tools.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/tools/tst_tools.cpp b/tests/auto/tools/tst_tools.cpp
index 956d24a04..476a74d78 100644
--- a/tests/auto/tools/tst_tools.cpp
+++ b/tests/auto/tools/tst_tools.cpp
@@ -30,6 +30,7 @@
#include <app/shared/commandlineparser.h>
#include <logging/logger.h>
#include <tools/fileinfo.h>
+#include <tools/hostosinfo.h>
#include <QDir>
#include <QtTest>
@@ -86,9 +87,8 @@ private slots:
QCOMPARE(FileInfo::path("/abc/lol"), QString("/abc"));
QVERIFY(!FileInfo::isAbsolute("bla/lol"));
QVERIFY(FileInfo::isAbsolute("/bla/lol"));
-#ifdef Q_OS_WIN
- QVERIFY(FileInfo::isAbsolute("C:\\bla\\lol"));
-#endif
+ if (HostOsInfo::isWindowsHost())
+ QVERIFY(FileInfo::isAbsolute("C:\\bla\\lol"));
QCOMPARE(FileInfo::resolvePath("/abc/lol", "waffl"), QString("/abc/lol/waffl"));
QCOMPARE(FileInfo::resolvePath("/abc/def/ghi/jkl/", "../foo/bar"), QString("/abc/def/ghi/foo/bar"));
QCOMPARE(FileInfo::resolvePath("/abc/def/ghi/jkl/", "../../foo/bar"), QString("/abc/def/foo/bar"));