diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,9 +28,6 @@
 include(ECMAddTests)
 include(CMakePackageConfigHelpers)
 
-#TODO remove these
-remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
-
 ecm_setup_version(PROJECT
                   VARIABLE_PREFIX BALOO_WIDGETS
                   SOVERSION 5
diff --git a/src/filemetadataprovider.h b/src/filemetadataprovider.h
--- a/src/filemetadataprovider.h
+++ b/src/filemetadataprovider.h
@@ -143,7 +143,7 @@
     void totalPropertyAndInsert(const QString& prop, const QList<QVariantMap>& resources,
                                 QSet<QString>& allProperties);
 
-    /*
+    /**
      * @return The number of subdirectories for the directory \a path.
      */
     static int subDirectoriesCount(const QString &path);
diff --git a/src/filemetadataprovider.cpp b/src/filemetadataprovider.cpp
--- a/src/filemetadataprovider.cpp
+++ b/src/filemetadataprovider.cpp
@@ -28,14 +28,7 @@
 
 #include <QTimer>
 #include <QDebug>
-
-// Required includes for subDirectoriesCount():
-#ifdef Q_OS_WIN
-    #include <QDir>
-#else
-    #include <dirent.h>
-    #include <QFile>
-#endif
+#include <QDir>
 
 using namespace Baloo;
 
@@ -488,35 +481,8 @@
 
 int FileMetaDataProvider::subDirectoriesCount(const QString& path)
 {
-#ifdef Q_OS_WIN
     QDir dir(path);
     return dir.entryList(QDir::AllEntries|QDir::NoDotAndDotDot|QDir::System).count();
-#else
-    // Taken from kdelibs/kio/kio/kdirmodel.cpp
-    // Copyright (C) 2006 David Faure <faure@kde.org>
-
-    int count = -1;
-    DIR* dir = ::opendir(QFile::encodeName(path));
-    if (dir) {
-        count = 0;
-        struct dirent *dirEntry = nullptr;
-        while ((dirEntry = ::readdir(dir))) { // krazy:exclude=syscalls
-            if (dirEntry->d_name[0] == '.') {
-                if (dirEntry->d_name[1] == '\0') {
-                    // Skip "."
-                    continue;
-                }
-                if (dirEntry->d_name[1] == '.' && dirEntry->d_name[2] == '\0') {
-                    // Skip ".."
-                    continue;
-                }
-            }
-            ++count;
-        }
-        ::closedir(dir);
-    }
-    return count;
-#endif
 }
 
 bool FileMetaDataProvider::realTimeIndexing()