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

Merge "Merge remote-tracking branch 'origin/13.0'"

Browse Source
This commit is contained in:
The Qt Project
2024-04-22 11:33:50 +00:00
parent 6f984bd285 e5640386f8
commit 2ab8e2f35d
20 changed files with 81 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -18,9 +18,12 @@ using namespace ProjectExplorer;
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,
@@ -30,7 +33,7 @@ std::unique_ptr<FolderNode> createCMakeVFolder(const Utils::FilePath &basePath,
auto newFolder = std::make_unique<VirtualFolderNode>(basePath);
newFolder->setPriority(priority);
newFolder->setDisplayName(displayName);
newFolder->setIsSourcesOrHeaders(sourcesOrHeadersFolder(displayName));
newFolder->setIsSourcesOrHeaders(defaultCMakeSourceGroupFolder(displayName));
return newFolder;
}

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

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