simplify signature of MSVC.prepareCompiler

Change-Id: I1c42f03aa7aa539560ba3da520a2df16758f9485
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

2 files changed, 17 insertions, 28 deletions

diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js
index 03966234f..e165d21c0 100644
--- a/share/qbs/modules/cpp/msvc.js
+++ b/share/qbs/modules/cpp/msvc.js
@@ -1,4 +1,4 @@
-function prepareCompiler(product, input, outputs, platformDefines, defines, includePaths, systemIncludePaths, cFlags, cxxFlags) {
+function prepareCompiler(product, input, outputs) {
     var i;
     var optimization = ModUtils.moduleProperty(input, "optimization")
     var debugInformation = ModUtils.moduleProperty(input, "debugInformation")
@@ -33,12 +33,16 @@ function prepareCompiler(product, input, outputs, platformDefines, defines, incl
         args.push('/Wall')
     if (ModUtils.moduleProperty(input, "treatWarningsAsErrors"))
         args.push('/WX')
+    var includePaths = ModUtils.moduleProperties(input, 'includePaths');
     for (i in includePaths)
         args.push('/I' + FileInfo.toWindowsSeparators(includePaths[i]))
+    var systemIncludePaths = ModUtils.moduleProperties(input, 'systemIncludePaths');
     for (i in systemIncludePaths)
         args.push('/I' + FileInfo.toWindowsSeparators(systemIncludePaths[i]))
+    var platformDefines = ModUtils.moduleProperty(input, 'platformDefines');
     for (i in platformDefines)
         args.push('/D' + platformDefines[i])
+    var defines = ModUtils.moduleProperties(input, 'defines');
     for (i in defines)
         args.push('/D' + defines[i])
 
@@ -89,10 +93,15 @@ function prepareCompiler(product, input, outputs, platformDefines, defines, incl
         }
     }
 
-    if (cxxFlags && tag === "cpp")
-        args = args.concat(cxxFlags);
-    else if (cFlags && tag === "c")
-        args = args.concat(cFlags);
+    if (tag === "cpp") {
+        args = args.concat(
+                    ModUtils.moduleProperties(input, 'platformCxxFlags'),
+                    ModUtils.moduleProperties(input, 'cxxFlags'));
+    } else if (tag === "c") {
+        args = args.concat(
+                    ModUtils.moduleProperties(input, 'platformCFlags'),
+                    ModUtils.moduleProperties(input, 'cFlags'));
+    }
 
     var compilerPath = ModUtils.moduleProperty(product, "compilerPath");
     var wrapperArgs = ModUtils.moduleProperty(product, "compilerWrapper");
diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs
index 2779ec830..00c56d153 100644
--- a/share/qbs/modules/cpp/windows-msvc.qbs
+++ b/share/qbs/modules/cpp/windows-msvc.qbs
@@ -45,13 +45,7 @@ CppModule {
             filePath: ".obj/" + product.name + '_c.pch'
         }
         prepare: {
-            var platformDefines = ModUtils.moduleProperty(input, 'platformDefines');
-            var defines = ModUtils.moduleProperties(input, 'defines');
-            var includePaths = ModUtils.moduleProperties(input, 'includePaths');
-            var systemIncludePaths = ModUtils.moduleProperties(input, 'systemIncludePaths');
-            var cFlags = ModUtils.moduleProperties(input, 'platformCFlags').concat(
-                        ModUtils.moduleProperties(input, 'cFlags'));
-            return MSVC.prepareCompiler(product, input, outputs, platformDefines, defines, includePaths, systemIncludePaths, cFlags, undefined)
+            return MSVC.prepareCompiler(product, input, outputs);
         }
     }
 
@@ -72,13 +66,7 @@ CppModule {
             filePath: ".obj/" + product.name + '_cpp.pch'
         }
         prepare: {
-            var platformDefines = ModUtils.moduleProperty(input, 'platformDefines');
-            var defines = ModUtils.moduleProperties(input, 'defines');
-            var includePaths = ModUtils.moduleProperties(input, 'includePaths');
-            var systemIncludePaths = ModUtils.moduleProperties(input, 'systemIncludePaths');
-            var cxxFlags = ModUtils.moduleProperties(input, 'platformCxxFlags').concat(
-                        ModUtils.moduleProperties(input, 'cxxFlags'));
-            return MSVC.prepareCompiler(product, input, outputs, platformDefines, defines, includePaths, systemIncludePaths, undefined, cxxFlags)
+            return MSVC.prepareCompiler(product, input, outputs);
         }
     }
 
@@ -94,15 +82,7 @@ CppModule {
         }
 
         prepare: {
-            var platformDefines = ModUtils.moduleProperty(input, 'platformDefines');
-            var defines = ModUtils.moduleProperties(input, 'defines');
-            var includePaths = ModUtils.moduleProperties(input, 'includePaths');
-            var systemIncludePaths = ModUtils.moduleProperties(input, 'systemIncludePaths');
-            var cFlags = ModUtils.moduleProperties(input, 'platformCFlags').concat(
-                        ModUtils.moduleProperties(input, 'cFlags'));
-            var cxxFlags = ModUtils.moduleProperties(input, 'platformCxxFlags').concat(
-                        ModUtils.moduleProperties(input, 'cxxFlags'));
-            return MSVC.prepareCompiler(product, input, outputs, platformDefines, defines, includePaths, systemIncludePaths, cFlags, cxxFlags)
+            return MSVC.prepareCompiler(product, input, outputs);
         }
     }