Merge remote-tracking branch 'origin/10.0'

Change-Id: I8b36c1812b61dbe08fe3e7930f950e6b8e8a7079
2023-04-24 08:52:35 +02:00
parent bb9ba4349a 05f80a132d
commit c9696fbabb
33 changed files with 699 additions and 95 deletions
--- a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
+++ b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
@@ -411,7 +411,7 @@ RawProjectParts generateRawProjectParts(const PreprocessedData &input,
                        continue;
                    const auto mimeTypes = Utils::mimeTypesForFileName(si.path);
                    for (const auto &mime : mimeTypes)
-                        if (mime.name() == headerMimeType)
+                        if (mime.inherits(headerMimeType))
                            sources.push_back(sourceDir.absoluteFilePath(si.path));
                }
            }