Merge 1.6 into master

Change-Id: I5a0de1ab1c38080d6061045d28fa9220a88ef4ba

1 files changed, 14 insertions, 4 deletions

diff --git a/src/lib/corelib/buildgraph/depscanner.cpp b/src/lib/corelib/buildgraph/depscanner.cpp
index f7d309f3e..02c63ce5d 100644
--- a/src/lib/corelib/buildgraph/depscanner.cpp
+++ b/src/lib/corelib/buildgraph/depscanner.cpp
@@ -63,14 +63,24 @@ static void collectCppIncludePaths(const QVariantMap &modules, QSet<QString> *co
     QMapIterator<QString, QVariant> iterator(modules);
     while (iterator.hasNext()) {
         iterator.next();
+        const auto properties = iterator.value().toMap();
         if (iterator.key() == QLatin1String("cpp")) {
-            QVariant includePathsVariant =
-                    iterator.value().toMap().value(QLatin1String("includePaths"));
+            QVariant includePathsVariant = properties.value(QLatin1String("includePaths"));
             if (includePathsVariant.isValid())
                 collectedPaths->unite(QSet<QString>::fromList(includePathsVariant.toStringList()));
+            QVariant systemIncludePathsVariant =
+                    properties.value(QLatin1String("systemIncludePaths"));
+            if (systemIncludePathsVariant.isValid())
+                collectedPaths->unite(QSet<QString>::fromList(
+                                          systemIncludePathsVariant.toStringList()));
+            QVariant compilerIncludePathsVariant =
+                    properties.value(QLatin1String("compilerIncludePaths"));
+            if (compilerIncludePathsVariant.isValid())
+                collectedPaths->unite(QSet<QString>::fromList(
+                                          compilerIncludePathsVariant.toStringList()));
         } else {
-            collectCppIncludePaths(iterator.value().toMap().value(QLatin1String("modules")).toMap(),
-                                collectedPaths);
+            collectCppIncludePaths(properties.value(QLatin1String("modules")).toMap(),
+                                   collectedPaths);
         }
     }
 }