From 48990c940062803aa4569f9462382b83a1537b73 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 3 Jan 2023 16:40:56 +0100
Subject: [PATCH] Qmake: Use FileUtils::commonPath instead of the string based
 version

Change-Id: Ib7dce9ed26b6ca280767e88ada2bcff52c8a5684
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 src/plugins/qmakeprojectmanager/qmakenodes.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
index 00d1eea99a5..11228fdf765 100644
--- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
@@ -15,8 +15,8 @@
 
 #include <resourceeditor/resourcenode.h>
 
+#include <utils/fileutils.h>
 #include <utils/qtcassert.h>
-#include <utils/stringutils.h>
 
 #include <android/androidconstants.h>
 #include <ios/iosconstants.h>
@@ -114,11 +114,11 @@ bool QmakeBuildSystem::supportsAction(Node *context, ProjectAction action, const
                 // A virtual folder, we do what the projectexplorer does
                 const FolderNode *folder = node->asFolderNode();
                 if (folder) {
-                    QStringList list;
+                    FilePaths list;
                     const auto folderNodes = folder->folderNodes();
                     for (FolderNode *f : folderNodes)
-                        list << f->filePath().toString() + QLatin1Char('/');
-                    if (n->deploysFolder(Utils::commonPath(list)))
+                        list << f->filePath();
+                    if (n->deploysFolder(FileUtils::commonPath(list).toString()))
                         addExistingFiles = false;
                 }
             }