feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qmake: Use FileUtils::commonPath instead of the string based version

Browse Source 
Change-Id: Ib7dce9ed26b6ca280767e88ada2bcff52c8a5684
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
hjk
2023-01-03 16:40:56 +01:00
parent 1b43a4a1bd
commit 48990c9400
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -15,8 +15,8 @@
#include <resourceeditor/resourcenode.h> #include <resourceeditor/resourcenode.h>
#include <utils/fileutils.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <android/androidconstants.h> #include <android/androidconstants.h>
#include <ios/iosconstants.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 // A virtual folder, we do what the projectexplorer does
const FolderNode *folder = node->asFolderNode(); const FolderNode *folder = node->asFolderNode();
if (folder) { if (folder) {
QStringList list; FilePaths list;
const auto folderNodes = folder->folderNodes(); const auto folderNodes = folder->folderNodes();
for (FolderNode *f : folderNodes) for (FolderNode *f : folderNodes)
list << f->filePath().toString() + QLatin1Char('/'); list << f->filePath();
if (n->deploysFolder(Utils::commonPath(list))) if (n->deploysFolder(FileUtils::commonPath(list).toString()))
addExistingFiles = false; addExistingFiles = false;
} }
} }