1 files changed, 10 insertions, 7 deletions
diff --git a/share/qbs/modules/cpp/windows-msvc-base.qbs b/share/qbs/modules/cpp/windows-msvc-base.qbs
index e88c3f15f..81fe48385 100644
--- a/share/qbs/modules/cpp/windows-msvc-base.qbs
+++ b/share/qbs/modules/cpp/windows-msvc-base.qbs
@@ -81,7 +81,6 @@ CppModule {
     separateDebugInformation: true
 
     property bool generateManifestFile: true
-    property string toolchainInstallPath
 
     architecture: qbs.architecture
     endianness: "little"
@@ -89,6 +88,7 @@ CppModule {
     dynamicLibrarySuffix: ".dll"
     executableSuffix: ".exe"
     debugInfoSuffix: ".pdb"
+    objectSuffix: ".obj"
     imageFormat: "pe"
     Properties {
         condition: product.multiplexByQbsProperties.contains("buildVariants")
@@ -108,13 +108,15 @@ CppModule {
         }
     }
 
+    property string windowsSdkVersion
+
     Rule {
         condition: useCPrecompiledHeader
         inputs: ["c_pch_src"]
         auxiliaryInputs: ["hpp"]
         Artifact {
             fileTags: ['obj']
-            filePath: Utilities.getHash(input.completeBaseName) + '_c.obj'
+            filePath: Utilities.getHash(input.completeBaseName) + '_c' + input.cpp.objectSuffix
         }
         Artifact {
             fileTags: ['c_pch']
@@ -132,7 +134,7 @@ CppModule {
         auxiliaryInputs: ["hpp"]
         Artifact {
             fileTags: ['obj']
-            filePath: Utilities.getHash(input.completeBaseName) + '_cpp.obj'
+            filePath: Utilities.getHash(input.completeBaseName) + '_cpp' + input.cpp.objectSuffix
         }
         Artifact {
             fileTags: ['cpp_pch']
@@ -157,12 +159,13 @@ CppModule {
             var artifacts = [];
             artifacts.push({
                 fileTags: tags,
-                filePath: Utilities.getHash(input.baseDir) + "/" + input.fileName + ".obj"
+                filePath: Utilities.getHash(input.baseDir) + "/" + input.fileName + input.cpp.objectSuffix
             });
             if (input.cpp.generateCompilerListingFiles) {
                 artifacts.push({
                     fileTags: ["lst"],
-                    filePath: Utilities.getHash(input.baseDir) + "/" + input.fileName + ".lst"
+                    filePath: Utilities.getHash(input.baseDir)
+                              + "/" + input.fileName + input.cpp.compilerListingSuffix
                 });
             }
             return artifacts;
@@ -210,7 +213,7 @@ CppModule {
                     fileTags: ["mem_map"],
                     filePath: FileInfo.joinPaths(
                                   product.destinationDirectory,
-                                  product.targetName + ".map")
+                                  product.targetName + product.cpp.linkerMapSuffix)
                 });
             }
             return artifacts;
@@ -327,7 +330,7 @@ CppModule {
     Rule {
         inputs: ["asm"]
         Artifact {
-            filePath: Utilities.getHash(input.baseDir) + "/" + input.completeBaseName + ".obj"
+            filePath: Utilities.getHash(input.baseDir) + "/" + input.completeBaseName + input.cpp.objectSuffix
             fileTags: ["obj"]
         }
         prepare: {