aboutsummaryrefslogtreecommitdiffstats
path: root/share/qbs/modules/cpp/windows-msvc.qbs
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2014-07-21 16:09:22 +0200
committerJoerg Bornemann <joerg.bornemann@digia.com>2014-07-22 15:35:58 +0200
commit538fc819d54df01b8d8581371bde902da22b7c57 (patch)
tree7a9a2a44cf630a9f6ca5e2406ad7921448726ce4 /share/qbs/modules/cpp/windows-msvc.qbs
parent5492470c39547dfedf7763ef12dfb218f1c93c31 (diff)
simplify signature of MSVC.prepareCompiler
Change-Id: I1c42f03aa7aa539560ba3da520a2df16758f9485 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'share/qbs/modules/cpp/windows-msvc.qbs')
-rw-r--r--share/qbs/modules/cpp/windows-msvc.qbs26
1 files changed, 3 insertions, 23 deletions
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);
}
}