Merge remote-tracking branch 'origin/13.0'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	src/plugins/cppeditor/cppcodemodelsettings.cpp
	src/plugins/cppeditor/cppcodemodelsettings.h

Change-Id: I54937c39b06897a72a105e4e0a8b5f8a76c38e26

src/plugins/cmakeprojectmanager/cmakeproject.cpp

@@ -210,7 +210,7 @@ void CMakeProject::setupBuildPresets(Internal::PresetsData &presetsData)
 {
     for (auto &buildPreset : presetsData.buildPresets) {
         if (buildPreset.inheritConfigureEnvironment) {
-            if (!buildPreset.configurePreset) {
+            if (!buildPreset.configurePreset && !buildPreset.hidden) {
                 TaskHub::addTask(BuildSystemTask(
                     Task::TaskType::Error,
                     Tr::tr("Build preset %1 is missing a corresponding configure preset.")

src/plugins/cmakeprojectmanager/projecttreehelper.cpp

@@ -35,7 +35,8 @@ void addCMakeVFolder(FolderNode *base,
                      int priority,
                      const QString &displayName,
                      std::vector<std::unique_ptr<FileNode>> &&files,
-                     bool sourcesOrHeaders)
+                     bool sourcesOrHeaders,
+                     bool listInProject)
 {
     if (files.size() == 0)
         return;
@@ -45,6 +46,10 @@ void addCMakeVFolder(FolderNode *base,
         folder = newFolder.get();
         base->addNode(std::move(newFolder));
     }
+    if (!listInProject) {
+        for (auto it = files.begin(); it != files.end(); ++it)
+            (*it)->setListInProject(false);
+    }
     folder->addNestedNodes(std::move(files));
     folder->forEachFolderNode([] (FolderNode *fn) { fn->compress(); });
 }
@@ -68,10 +73,7 @@ void addCMakeInputs(FolderNode *root,
     std::unique_ptr<ProjectNode> cmakeVFolder = std::make_unique<CMakeInputsNode>(root->filePath());
 
     QSet<Utils::FilePath> knownFiles;
-    root->forEachGenericNode([&knownFiles](const Node *n) {
-        if (n->listInProject())
-            knownFiles.insert(n->filePath());
-    });
+    root->forEachGenericNode([&knownFiles](const Node *n) { knownFiles.insert(n->filePath()); });
 
     addCMakeVFolder(cmakeVFolder.get(),
                     sourceDir,
@@ -87,7 +89,9 @@ void addCMakeInputs(FolderNode *root,
                     Utils::FilePath(),
                     10,
                     Tr::tr("<Other Locations>"),
-                    removeKnownNodes(knownFiles, std::move(rootInputs)));
+                    removeKnownNodes(knownFiles, std::move(rootInputs)),
+                    /*sourcesOrHeaders=*/false,
+                    /*listInProject=*/false);
 
     root->addNode(std::move(cmakeVFolder));
 }

src/plugins/cmakeprojectmanager/projecttreehelper.h

@@ -21,7 +21,8 @@ void addCMakeVFolder(ProjectExplorer::FolderNode *base,
                      int priority,
                      const QString &displayName,
                      std::vector<std::unique_ptr<ProjectExplorer::FileNode>> &&files,
-                     bool sourcesOrHeaders = false);
+                     bool sourcesOrHeaders = false,
+                     bool listInProject = true);
 
 std::vector<std::unique_ptr<ProjectExplorer::FileNode>> &&removeKnownNodes(
     const QSet<Utils::FilePath> &knownFiles,