From cd8dc3ae12663dee7464b3704fbdf019d76a4486 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 18 Nov 2014 14:34:55 +0100 Subject: [PATCH] Tests: Fix tst_fileutils for Qt5.4+ Change-Id: I65b4eb8dff91c69bff50c63cd42a4894df0470f0 Reviewed-by: Tobias Hunger --- tests/auto/utils/fileutils/tst_fileutils.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/auto/utils/fileutils/tst_fileutils.cpp b/tests/auto/utils/fileutils/tst_fileutils.cpp index 387d402053f..1c8c3d996a7 100644 --- a/tests/auto/utils/fileutils/tst_fileutils.cpp +++ b/tests/auto/utils/fileutils/tst_fileutils.cpp @@ -61,7 +61,11 @@ void tst_fileutils::parentDir_data() QTest::newRow("/tmp/dir") << QString::fromLatin1("/tmp/dir") << QString::fromLatin1("/tmp") << QString(); QTest::newRow("relative/path") << QString::fromLatin1("relative/path") << QString::fromLatin1("relative") << QString(); QTest::newRow("relativepath") << QString::fromLatin1("relativepath") << QString::fromLatin1(".") +#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0) << QString::fromLatin1("see QTBUG-23892"); +#else + << QString(); +#endif // Windows stuff: #ifdef Q_OS_WIN