diff --git a/autotests/embeddedimagedatatest.cpp b/autotests/embeddedimagedatatest.cpp
--- a/autotests/embeddedimagedatatest.cpp
+++ b/autotests/embeddedimagedatatest.cpp
@@ -30,7 +30,7 @@
 
 QString EmbeddedImageDataTest::testFilePath(const QString& fileName) const
 {
-    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QDir::separator() + fileName;
+    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QLatin1Char('/') + fileName;
 }
 
 void EmbeddedImageDataTest::test()
diff --git a/autotests/epubextractortest.cpp b/autotests/epubextractortest.cpp
--- a/autotests/epubextractortest.cpp
+++ b/autotests/epubextractortest.cpp
@@ -31,7 +31,7 @@
 
 QString EPubExtractorTest::testFilePath(const QString& fileName) const
 {
-    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QDir::separator() + fileName;
+    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QLatin1Char('/') + fileName;
 }
 
 void EPubExtractorTest::test()
diff --git a/autotests/exiv2extractortest.cpp b/autotests/exiv2extractortest.cpp
--- a/autotests/exiv2extractortest.cpp
+++ b/autotests/exiv2extractortest.cpp
@@ -31,7 +31,7 @@
 
 QString Exiv2ExtractorTest::testFilePath(const QString& fileName) const
 {
-    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QDir::separator() + fileName;
+    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QLatin1Char('/') + fileName;
 }
 
 void Exiv2ExtractorTest::test()
diff --git a/autotests/externalextractortest.cpp b/autotests/externalextractortest.cpp
--- a/autotests/externalextractortest.cpp
+++ b/autotests/externalextractortest.cpp
@@ -33,7 +33,7 @@
 
 QString ExternalExtractorTest::testFilePath(const QString& fileName) const
 {
-    return QLatin1String(INDEXER_TESTS_SAMPLE_CONFIGURED_FILES_PATH) + QDir::separator() + fileName;
+    return QLatin1String(INDEXER_TESTS_SAMPLE_CONFIGURED_FILES_PATH) + QLatin1Char('/') + fileName;
 }
 
 void ExternalExtractorTest::test()
diff --git a/autotests/externalwritertest.cpp b/autotests/externalwritertest.cpp
--- a/autotests/externalwritertest.cpp
+++ b/autotests/externalwritertest.cpp
@@ -33,7 +33,7 @@
 
 QString ExternalWriterTest::testFilePath(const QString& fileName) const
 {
-    return QLatin1String(INDEXER_TESTS_SAMPLE_CONFIGURED_FILES_PATH) + QDir::separator() + fileName;
+    return QLatin1String(INDEXER_TESTS_SAMPLE_CONFIGURED_FILES_PATH) + QLatin1Char('/') + fileName;
 }
 
 void ExternalWriterTest::test()
diff --git a/autotests/indexerextractortests.cpp b/autotests/indexerextractortests.cpp
--- a/autotests/indexerextractortests.cpp
+++ b/autotests/indexerextractortests.cpp
@@ -37,7 +37,7 @@
 
 QString IndexerExtractorTests::testFilePath(const QString& fileName) const
 {
-    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QDir::separator() + fileName;
+    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QLatin1Char('/') + fileName;
 }
 
 void IndexerExtractorTests::benchMarkPlainTextExtractor()
diff --git a/autotests/mobiextractortest.cpp b/autotests/mobiextractortest.cpp
--- a/autotests/mobiextractortest.cpp
+++ b/autotests/mobiextractortest.cpp
@@ -31,7 +31,7 @@
 
 QString MobiExtractorTest::testFilePath(const QString& fileName) const
 {
-    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QDir::separator() + fileName;
+    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QLatin1Char('/') + fileName;
 }
 
 void MobiExtractorTest::test()
diff --git a/autotests/odfextractortest.cpp b/autotests/odfextractortest.cpp
--- a/autotests/odfextractortest.cpp
+++ b/autotests/odfextractortest.cpp
@@ -33,7 +33,7 @@
 
 QString OdfExtractorTest::testFilePath(const QString& fileName) const
 {
-    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QDir::separator() + fileName;
+    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QLatin1Char('/') + fileName;
 }
 
 void OdfExtractorTest::testText()
diff --git a/autotests/office2007extractortest.cpp b/autotests/office2007extractortest.cpp
--- a/autotests/office2007extractortest.cpp
+++ b/autotests/office2007extractortest.cpp
@@ -31,7 +31,7 @@
 
 QString Office2007ExtractorTest::testFilePath(const QString& fileName) const
 {
-    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QDir::separator() + fileName;
+    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QLatin1Char('/') + fileName;
 }
 
 void Office2007ExtractorTest::test()
diff --git a/autotests/popplerextractortest.cpp b/autotests/popplerextractortest.cpp
--- a/autotests/popplerextractortest.cpp
+++ b/autotests/popplerextractortest.cpp
@@ -31,7 +31,7 @@
 
 QString PopplerExtractorTest::testFilePath(const QString& fileName) const
 {
-    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QDir::separator() + fileName;
+    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QLatin1Char('/') + fileName;
 }
 
 void PopplerExtractorTest::test()
diff --git a/autotests/taglibextractortest.cpp b/autotests/taglibextractortest.cpp
--- a/autotests/taglibextractortest.cpp
+++ b/autotests/taglibextractortest.cpp
@@ -36,7 +36,7 @@
 
 QString TagLibExtractorTest::testFilePath(const QString& fileName) const
 {
-    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QDir::separator() + fileName;
+    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QLatin1Char('/') + fileName;
 }
 
 const QStringList TagLibExtractorTest::propertyEnumNames(const QList<KFileMetaData::Property::Property>& keys) const
diff --git a/autotests/taglibwritertest.cpp b/autotests/taglibwritertest.cpp
--- a/autotests/taglibwritertest.cpp
+++ b/autotests/taglibwritertest.cpp
@@ -17,7 +17,7 @@
 
 QString TagLibWriterTest::testFilePath(const QString& fileName) const
 {
-    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QDir::separator() + fileName;
+    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QLatin1Char('/') + fileName;
 }
 
 void TagLibWriterTest::testCommonData()
diff --git a/autotests/usermetadatawritertest.cpp b/autotests/usermetadatawritertest.cpp
--- a/autotests/usermetadatawritertest.cpp
+++ b/autotests/usermetadatawritertest.cpp
@@ -32,7 +32,7 @@
 
 QString UserMetaDataWriterTest::testFilePath(const QString& fileName) const
 {
-    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QDir::separator() + fileName;
+    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QLatin1Char('/') + fileName;
 }
 
 void UserMetaDataWriterTest::initTestCase()