From 86c2143353820a0bacae1c780286c2fbe9dcda37 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Mon, 23 Jan 2023 13:27:15 +0100
Subject: [PATCH] QbsProjectManager: Make generated sources known to code model

The code model should know about e.g. ui headers belonging to the
project.

Change-Id: I89acb679f22fc050b3ac3b3e77fc64154ad05c20
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/qbsprojectmanager/qbsproject.cpp | 37 +++++++++++++-------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index 8a8676fefdc..ef22f02c8f1 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -860,13 +860,15 @@ static RawProjectPart generateProjectPart(
         )
 {
     const QString productName = product.value("full-display-name").toString();
-    const QString groupName = group.value("name").toString();
+    const QString groupName = group.isEmpty() ? productName + "_generated_qtc_internal"
+                                              : group.value("name").toString();
+    const QJsonObject &groupOrProduct = group.isEmpty() ? product : group;
     RawProjectPart rpp;
     rpp.setQtVersion(qtVersion);
     QJsonObject props = group.value("module-properties").toObject();
     if (props.isEmpty())
         props = product.value("module-properties").toObject();
-    rpp.setCallGroupId(groupLocationToCallGroupId(group.value("location").toObject()));
+    rpp.setCallGroupId(groupLocationToCallGroupId(groupOrProduct.value("location").toObject()));
 
     QStringList cFlags;
     QStringList cxxFlags;
@@ -879,24 +881,24 @@ static RawProjectPart generateProjectPart(
     rpp.setMacros(transform<QVector>(defines,
             [](const QString &s) { return Macro::fromKeyValue(s); }));
 
-    ProjectExplorer::HeaderPaths grpHeaderPaths;
+    ProjectExplorer::HeaderPaths headerPaths;
     QStringList list = arrayToStringList(props.value("cpp.includePaths"));
     list.removeDuplicates();
     for (const QString &p : std::as_const(list))
-        grpHeaderPaths += HeaderPath::makeUser(FilePath::fromUserInput(p));
+        headerPaths += HeaderPath::makeUser(FilePath::fromUserInput(p));
     list = arrayToStringList(props.value("cpp.distributionIncludePaths"))
             + arrayToStringList(props.value("cpp.systemIncludePaths"));
     list.removeDuplicates();
     for (const QString &p : std::as_const(list))
-        grpHeaderPaths += HeaderPath::makeSystem(FilePath::fromUserInput(p));
+        headerPaths += HeaderPath::makeSystem(FilePath::fromUserInput(p));
     list = arrayToStringList(props.value("cpp.frameworkPaths"));
     list.append(arrayToStringList(props.value("cpp.systemFrameworkPaths")));
     list.removeDuplicates();
     for (const QString &p : std::as_const(list))
-        grpHeaderPaths += HeaderPath::makeFramework(FilePath::fromUserInput(p));
-    rpp.setHeaderPaths(grpHeaderPaths);
+        headerPaths += HeaderPath::makeFramework(FilePath::fromUserInput(p));
+    rpp.setHeaderPaths(headerPaths);
     rpp.setDisplayName(groupName);
-    const QJsonObject location = group.value("location").toObject();
+    const QJsonObject location = groupOrProduct.value("location").toObject();
     rpp.setProjectFileLocation(location.value("file-path").toString(),
                                location.value("line").toInt(),
                                location.value("column").toInt());
@@ -912,7 +914,7 @@ static RawProjectPart generateProjectPart(
             rpp.setBuildTargetType(BuildTargetType::Unknown);
         }
     }
-    rpp.setSelectedForBuilding(group.value("is-enabled").toBool());
+    rpp.setSelectedForBuilding(groupOrProduct.value("is-enabled").toBool());
 
     QHash<QString, QJsonObject> filePathToSourceArtifact;
     bool hasCFiles = false;
@@ -933,7 +935,10 @@ static RawProjectPart generateProjectPart(
                 hasObjcxxFiles = true;
         }
     };
-    forAllArtifacts(group, artifactWorker);
+    if (!group.isEmpty())
+        forAllArtifacts(group, artifactWorker);
+    else
+        forAllArtifacts(product, ArtifactType::Generated, artifactWorker);
 
     QSet<QString> pchFiles;
     if (hasCFiles && props.value("cpp.useCPrecompiledHeader").toBool()
@@ -998,10 +1003,18 @@ static RawProjectParts generateProjectParts(
                   ? Utils::QtMajorVersion::None
                   : qtVersion;
         const QJsonArray groups = prd.value("groups").toArray();
+        const auto appendIfNotEmpty = [&rpps](const RawProjectPart &rpp) {
+            if (!rpp.files.isEmpty())
+                rpps << rpp;
+        };
         for (const QJsonValue &g : groups) {
-            rpps.append(generateProjectPart(prd, g.toObject(), cToolChain, cxxToolChain,
-                                            qtVersionForPart, cPch, cxxPch, objcPch, objcxxPch));
+            appendIfNotEmpty(generateProjectPart(
+                                 prd, g.toObject(), cToolChain, cxxToolChain, qtVersionForPart,
+                                 cPch, cxxPch, objcPch, objcxxPch));
         }
+        appendIfNotEmpty(generateProjectPart(
+                             prd, {}, cToolChain, cxxToolChain, qtVersionForPart,
+                             cPch, cxxPch, objcPch, objcxxPch));
     });
     return rpps;
 }