diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp
index 9c9d9fc9b99..451cf7e0a8b 100644
--- a/src/shared/proparser/qmakebuiltins.cpp
+++ b/src/shared/proparser/qmakebuiltins.cpp
@@ -554,14 +554,15 @@ ProStringList QMakeEvaluator::evaluateExpandFunction(
             if (args.count() == 2)
                 recursive = isTrue(args.at(1), m_tmp2);
             QStringList dirs;
-            QString r = fixPathToLocalOS(args.at(0).toQString(m_tmp1));
+            QString r = m_option->expandEnvVars(args.at(0).toQString(m_tmp1))
+                        .replace(QLatin1Char('\\'), QLatin1Char('/'));
             QString pfx;
             if (IoUtils::isRelativePath(r)) {
                 pfx = currentDirectory();
                 if (!pfx.endsWith(QLatin1Char('/')))
                     pfx += QLatin1Char('/');
             }
-            int slash = r.lastIndexOf(QDir::separator());
+            int slash = r.lastIndexOf(QLatin1Char('/'));
             if (slash != -1) {
                 dirs.append(r.left(slash+1));
                 r = r.mid(slash+1);
@@ -580,7 +581,7 @@ ProStringList QMakeEvaluator::evaluateExpandFunction(
                     QString fname = dir + qdir[i];
                     if (IoUtils::fileType(pfx + fname) == IoUtils::FileIsDir) {
                         if (recursive)
-                            dirs.append(fname + QDir::separator());
+                            dirs.append(fname + QLatin1Char('/'));
                     }
                     if (regex.exactMatch(qdir[i]))
                         ret += ProString(fname, NoHash).setSource(currentProFile());
diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp
index 3b302f339fb..02d2d1594d0 100644
--- a/src/shared/proparser/qmakeevaluator.cpp
+++ b/src/shared/proparser/qmakeevaluator.cpp
@@ -340,22 +340,6 @@ static void replaceInList(ProStringList *varlist,
     }
 }
 
-// This is braindead, but we want qmake compat
-QString QMakeEvaluator::fixPathToLocalOS(const QString &str) const
-{
-    QString string = m_option->expandEnvVars(str);
-
-    if (string.length() > 2 && string.at(0).isLetter() && string.at(1) == QLatin1Char(':'))
-        string[0] = string[0].toLower();
-
-#if defined(Q_OS_WIN32)
-    string.replace(QLatin1Char('/'), QLatin1Char('\\'));
-#else
-    string.replace(QLatin1Char('\\'), QLatin1Char('/'));
-#endif
-    return string;
-}
-
 //////// Evaluator /////////
 
 static ALWAYS_INLINE void addStr(
diff --git a/src/shared/proparser/qmakeevaluator.h b/src/shared/proparser/qmakeevaluator.h
index 149ce806222..1122bf6f7ae 100644
--- a/src/shared/proparser/qmakeevaluator.h
+++ b/src/shared/proparser/qmakeevaluator.h
@@ -180,8 +180,6 @@ public:
             QHash<ProString, QSet<ProString> > &dependencies,
             ProValueMap &dependees, ProStringList &rootSet) const;
 
-    QString fixPathToLocalOS(const QString &str) const;
-
 #ifndef QT_BOOTSTRAPPED
     void runProcess(QProcess *proc, const QString &command, QProcess::ProcessChannel chan) const;
 #endif