Merge remote-tracking branch 'origin/10.0'

Change-Id: I7a3925ad8e4f97461b64a70217102ed900430253
This commit is contained in:
Eike Ziller
2023-05-05 10:39:47 +02:00
31 changed files with 286 additions and 127 deletions

View File

@@ -330,8 +330,9 @@ bool GenericBuildSystem::addFiles(Node *, const FilePaths &filePaths_, FilePaths
QSet<QString> toAdd;
for (const QString &filePath : filePaths) {
const QString directory = QFileInfo(filePath).absolutePath();
if (!includes.contains(directory))
const QFileInfo fi(filePath);
const QString directory = fi.absolutePath();
if (fi.fileName() == "include" && !includes.contains(directory))
toAdd << directory;
}