Handle ALL include path lists in the cpp dependency scanner

This will ensure that source files depending on header files within the
search paths listed in systemIncludePaths and compilerIncludePaths will
be recompiled when those headers change, as well.

Change-Id: I6995fcd533b065505e3eec219294540579a73407
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 14 insertions, 4 deletions

diff --git a/src/lib/corelib/buildgraph/depscanner.cpp b/src/lib/corelib/buildgraph/depscanner.cpp
index 04f5f6323..27280334c 100644
--- a/src/lib/corelib/buildgraph/depscanner.cpp
+++ b/src/lib/corelib/buildgraph/depscanner.cpp
@@ -54,14 +54,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);
         }
     }
 }