1 files changed, 7 insertions, 4 deletions
diff --git a/share/qbs/modules/cpp/windows-clang-cl.qbs b/share/qbs/modules/cpp/windows-clang-cl.qbs
index cc58097f6..9aa9d7395 100644
--- a/share/qbs/modules/cpp/windows-clang-cl.qbs
+++ b/share/qbs/modules/cpp/windows-clang-cl.qbs
@@ -35,9 +35,9 @@ import qbs.FileInfo
 import 'windows-msvc-base.qbs' as MsvcBaseModule
 
 MsvcBaseModule {
-    condition: Host.os().contains('windows') &&
-               qbs.targetOS.contains('windows') &&
-               qbs.toolchain && qbs.toolchain.contains('clang-cl')
+    condition: Host.os().includes('windows') &&
+               qbs.targetOS.includes('windows') &&
+               qbs.toolchain && qbs.toolchain.includes('clang-cl')
     priority: 100
 
     Probes.ClangClBinaryProbe {
@@ -85,14 +85,17 @@ MsvcBaseModule {
     linkerName: "lld-link.exe"
     linkerPath: FileInfo.joinPaths(toolchainInstallPath, linkerName)
 
+    systemIncludeFlag: "/imsvc"
+
     validateFunc: {
+        var baseFunc = base;
         return function() {
             if (_skipAllChecks)
                 return;
             var validator = new ModUtils.PropertyValidator("cpp");
             validator.setRequiredProperty("vcvarsallPath", vcvarsallPath);
             validator.validate();
-            base();
+            baseFunc();
         }
     }
 }