From d0e0ffd2d2ad4508bece0ec43c2aa9e56b0d513d Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Sat, 18 Apr 2020 20:55:35 +0000
Subject: [PATCH] Revert "CMake: Pass on extra files to code model"

This reverts commit 4d3eea6884c212893eea599d47edec2648e4c266.

Reason for revert: QTCREATORBUG-23876

Change-Id: I1b438d13cbdf64870e7cc9f7432665d773f58369
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 .../fileapidataextractor.cpp                  | 28 ++++---------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
index 568b9510bd3..79891a8b5b0 100644
--- a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
+++ b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
@@ -312,10 +312,11 @@ RawProjectParts generateRawProjectParts(const PreprocessedData &input,
                                         const FilePath &sourceDirectory)
 {
     RawProjectParts rpps;
-    const QDir sourceDir(sourceDirectory.toString());
 
     int counter = 0;
     for (const TargetDetails &t : input.targetDetails) {
+        QDir sourceDir(sourceDirectory.toString());
+
         bool needPostfix = t.compileGroups.size() > 1;
         int count = 1;
         for (const CompileInfo &ci : t.compileGroups) {
@@ -358,15 +359,14 @@ RawProjectParts generateRawProjectParts(const PreprocessedData &input,
             cxxProjectFlags.commandLineFlags = cProjectFlags.commandLineFlags;
             rpp.setFlagsForCxx(cxxProjectFlags);
 
-            FilePath precompiled_header = FilePath::fromString(
-                findOrDefault(t.sources, [&ending](const SourceInfo &si) {
-                    return si.path.endsWith(ending);
-                }).path);
+            FilePath precompiled_header
+                = FilePath::fromString(findOrDefault(t.sources, [&ending](const SourceInfo &si) {
+                                           return si.path.endsWith(ending);
+                                       }).path);
 
             rpp.setFiles(transform<QList>(ci.sources, [&t, &sourceDir](const int si) {
                 return sourceDir.absoluteFilePath(t.sources[static_cast<size_t>(si)].path);
             }));
-
             if (!precompiled_header.isEmpty()) {
                 if (precompiled_header.toFileInfo().isRelative()) {
                     const FilePath parentDir = FilePath::fromString(sourceDir.absolutePath());
@@ -381,22 +381,6 @@ RawProjectParts generateRawProjectParts(const PreprocessedData &input,
             rpps.append(rpp);
             ++count;
         }
-
-        // Check sources for more files and associate them with the current target
-        const QStringList extraSources = Utils::transform<QList>(
-            Utils::filtered(t.sources, [](const SourceInfo &si) { return si.compileGroup == -1; }),
-            [&sourceDir](const SourceInfo &si) { return sourceDir.absoluteFilePath(si.path); });
-        if (!extraSources.isEmpty()) {
-            RawProjectPart rpp;
-            rpp.setProjectFileLocation(t.sourceDir.pathAppended("CMakeLists.txt").toString());
-            rpp.setBuildSystemTarget(t.name);
-            rpp.setDisplayName(t.id + "_extra");
-
-            rpp.setFiles(extraSources);
-
-            // This is all the information we have :-/
-            rpps.append(rpp);
-        }
     }
 
     return rpps;