Make the project managers tell the code model about include paths

... from the environment.

Fixes: QTCREATORBUG-17985
Change-Id: I9b54e550121cfcc0684a6e173337d59d235c6107
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>

2 files changed, 10 insertions, 6 deletions

diff --git a/tests/auto/toolchaincache/tst_toolchaincache.cpp b/tests/auto/toolchaincache/tst_toolchaincache.cpp
index 10226802c3..3e4da445ac 100644
--- a/tests/auto/toolchaincache/tst_toolchaincache.cpp
+++ b/tests/auto/toolchaincache/tst_toolchaincache.cpp
@@ -46,7 +46,7 @@ void tst_ToolChainCache::insertOne()
 {
     const QStringList key1 = {"one"};
     const QString value1 = "value1";
-    ProjectExplorer::Cache<QString, 2> cache;
+    ProjectExplorer::Cache<QStringList, QString, 2> cache;
 
     cache.insert(key1, value1);
 
@@ -59,7 +59,7 @@ void tst_ToolChainCache::insertOneOne()
 {
     const QStringList key1 = {"one"};
     const QString value1 = "value1";
-    ProjectExplorer::Cache<QString, 2> cache;
+    ProjectExplorer::Cache<QStringList, QString, 2> cache;
 
     cache.insert(key1, value1);
     cache.insert(key1, value1);
@@ -75,7 +75,7 @@ void tst_ToolChainCache::insertOneTwo()
     const QString value1 = "value1";
     const QStringList key2 = {"two"};
     const QString value2 = "value2";
-    ProjectExplorer::Cache<QString, 2> cache;
+    ProjectExplorer::Cache<QStringList, QString, 2> cache;
 
     cache.insert(key1, value1);
     cache.insert(key2, value2);
@@ -95,7 +95,7 @@ void tst_ToolChainCache::insertOneTwoThree()
     const QString value2 = "value2";
     const QStringList key3 = {"three"};
     const QString value3 = "value3";
-    ProjectExplorer::Cache<QString, 2> cache;
+    ProjectExplorer::Cache<QStringList, QString, 2> cache;
 
     cache.insert(key1, value1);
     cache.insert(key2, value2);
@@ -117,7 +117,7 @@ void tst_ToolChainCache::insertOneTwoOneThree()
     const QString value2 = "value2";
     const QStringList key3 = {"three"};
     const QString value3 = "value3";
-    ProjectExplorer::Cache<QString, 2> cache;
+    ProjectExplorer::Cache<QStringList, QString, 2> cache;
 
     cache.insert(key1, value1);
     cache.insert(key2, value2);
diff --git a/tests/unit/mockup/projectexplorer/toolchain.h b/tests/unit/mockup/projectexplorer/toolchain.h
index 925b0a2ae8..022520cec0 100644
--- a/tests/unit/mockup/projectexplorer/toolchain.h
+++ b/tests/unit/mockup/projectexplorer/toolchain.h
@@ -33,6 +33,8 @@
 
 #include <functional>
 
+namespace Utils { class Environment; }
+
 namespace ProjectExplorer {
 
 class ToolChain
@@ -45,7 +47,9 @@ public:
 
     using BuiltInHeaderPathsRunner = std::function<HeaderPaths(
         const QStringList &cxxflags, const QString &sysRoot, const QString &originalTargetTriple)>;
-    virtual BuiltInHeaderPathsRunner createBuiltInHeaderPathsRunner() const { return BuiltInHeaderPathsRunner(); }
+    virtual BuiltInHeaderPathsRunner createBuiltInHeaderPathsRunner(const Utils::Environment &env) const {
+        return BuiltInHeaderPathsRunner();
+    }
 
     class MacroInspectionReport
     {