Merge remote-tracking branch 'origin/10.0'

Change-Id: I7a3925ad8e4f97461b64a70217102ed900430253

2 files changed, 5 insertions, 2 deletions

diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 906eeb5809a..ef83f906a95 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -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;
     }
 
diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
index 27d2a3932b5..1f125ff321c 100644
--- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
@@ -141,6 +141,8 @@ Core::GeneratedFiles GenericProjectWizard::generateFiles(const QWizard *w,
     const QDir dir(projectPath.toString());
     for (const QString &path : paths) {
         QFileInfo fileInfo(path);
+        if (fileInfo.fileName() != "include")
+            continue;
         QDir thisDir(fileInfo.absoluteFilePath());
 
         if (! thisDir.entryList(nameFilters, QDir::Files).isEmpty()) {