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

CMakePM: Treat all default CMake source groups as …

Browse Source 
… "Header|Sources Files" groups
Amends f76e0de7bc

Change-Id: I5e19427a481e87fb4d9761e3fad1727df52ca28b
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Cristian Adam
2024-04-17 21:40:11 +02:00
parent db492c461c
commit 01538332da
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
View File

@@ -685,7 +685,7 @@ static void addCompileGroups(ProjectNode *targetRoot,
node->setIsGenerated(true); node->setIsGenerated(true);
const bool showSourceFolders = settings().showSourceSubFolders() const bool showSourceFolders = settings().showSourceSubFolders()
&& sourcesOrHeadersFolder(td.sourceGroups[si.sourceGroup]); && defaultCMakeSourceGroupFolder(td.sourceGroups[si.sourceGroup]);
// Where does the file node need to go? // Where does the file node need to go?
if (showSourceFolders && sourcePath.isChildOf(buildDirectory) && !inSourceBuild) { if (showSourceFolders && sourcePath.isChildOf(buildDirectory) && !inSourceBuild) {
@@ -699,7 +699,7 @@ static void addCompileGroups(ProjectNode *targetRoot,
for (size_t i = 0; i < sourceGroupFileNodes.size(); ++i) { for (size_t i = 0; i < sourceGroupFileNodes.size(); ++i) {
const bool showSourceFolders = settings().showSourceSubFolders() const bool showSourceFolders = settings().showSourceSubFolders()
&& sourcesOrHeadersFolder(td.sourceGroups[i]); && defaultCMakeSourceGroupFolder(td.sourceGroups[i]);
std::vector<std::unique_ptr<FileNode>> &current = sourceGroupFileNodes[i]; std::vector<std::unique_ptr<FileNode>> &current = sourceGroupFileNodes[i];
FolderNode *insertNode = td.sourceGroups[i] == "TREE" FolderNode *insertNode = td.sourceGroups[i] == "TREE"

9
src/plugins/cmakeprojectmanager/projecttreehelper.cpp
View File

@@ -18,9 +18,12 @@ using namespace ProjectExplorer;
namespace CMakeProjectManager::Internal { namespace CMakeProjectManager::Internal {
bool sourcesOrHeadersFolder(const QString &displayName) bool defaultCMakeSourceGroupFolder(const QString &displayName)
{ {
return displayName == "Source Files" || displayName == "Header Files"; return displayName == "Source Files" || displayName == "Header Files"
|| displayName == "Resources" || displayName == ""
|| displayName == "Precompile Header File" || displayName == "CMake Rules"
|| displayName == "Object Files";
} }
std::unique_ptr<FolderNode> createCMakeVFolder(const Utils::FilePath &basePath, std::unique_ptr<FolderNode> createCMakeVFolder(const Utils::FilePath &basePath,
@@ -30,7 +33,7 @@ std::unique_ptr<FolderNode> createCMakeVFolder(const Utils::FilePath &basePath,
auto newFolder = std::make_unique<VirtualFolderNode>(basePath); auto newFolder = std::make_unique<VirtualFolderNode>(basePath);
newFolder->setPriority(priority); newFolder->setPriority(priority);
newFolder->setDisplayName(displayName); newFolder->setDisplayName(displayName);
newFolder->setIsSourcesOrHeaders(sourcesOrHeadersFolder(displayName)); newFolder->setIsSourcesOrHeaders(defaultCMakeSourceGroupFolder(displayName));
return newFolder; return newFolder;
} }

2
src/plugins/cmakeprojectmanager/projecttreehelper.h
View File

@@ -11,7 +11,7 @@
namespace CMakeProjectManager::Internal { namespace CMakeProjectManager::Internal {
bool sourcesOrHeadersFolder(const QString &displayName); bool defaultCMakeSourceGroupFolder(const QString &displayName);
std::unique_ptr<ProjectExplorer::FolderNode> createCMakeVFolder(const Utils::FilePath &basePath, std::unique_ptr<ProjectExplorer::FolderNode> createCMakeVFolder(const Utils::FilePath &basePath,
int priority, int priority,