1 files changed, 24 insertions, 5 deletions
diff --git a/share/qbs/modules/cpp/windows-msvc-base.qbs b/share/qbs/modules/cpp/windows-msvc-base.qbs
index b25fdf159..c45ec5ec3 100644
--- a/share/qbs/modules/cpp/windows-msvc-base.qbs
+++ b/share/qbs/modules/cpp/windows-msvc-base.qbs
@@ -40,6 +40,8 @@ import 'msvc.js' as MSVC
 CppModule {
     condition: false
 
+    Depends { name: "codesign" }
+
     windowsApiCharacterSet: "unicode"
     platformDefines: {
         var defines = base.concat(WindowsUtils.characterSetDefines(windowsApiCharacterSet))
@@ -100,6 +102,8 @@ CppModule {
 
     property var buildEnv
 
+    readonly property bool shouldSignArtifacts: codesign.enableCodeSigning
+
     setupBuildEnvironment: {
         for (var key in product.cpp.buildEnv) {
             var v = new ModUtils.EnvironmentVariable(key, ';');
@@ -108,6 +112,8 @@ CppModule {
         }
     }
 
+    property string windowsSdkVersion
+
     Rule {
         condition: useCPrecompiledHeader
         inputs: ["c_pch_src"]
@@ -162,7 +168,8 @@ CppModule {
             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;
@@ -189,10 +196,16 @@ CppModule {
         inputs: ['obj', 'native.pe.manifest', 'def']
         inputsFromDependencies: ['staticlibrary', 'dynamiclibrary_import', "debuginfo_app"]
 
-        outputFileTags: ["application", "debuginfo_app", "mem_map"]
+        outputFileTags: {
+            var tags = ["application", "debuginfo_app", "mem_map"];
+            if (shouldSignArtifacts)
+                tags.push("codesign.signed_artifact");
+            return tags;
+        }
         outputArtifacts: {
             var app = {
-                fileTags: ["application"],
+                fileTags: ["application"].concat(
+                    product.cpp.shouldSignArtifacts ? ["codesign.signed_artifact"] : []),
                 filePath: FileInfo.joinPaths(
                               product.destinationDirectory,
                               PathTools.applicationFilePath(product))
@@ -227,11 +240,17 @@ CppModule {
         inputs: ['obj', 'native.pe.manifest', 'def']
         inputsFromDependencies: ['staticlibrary', 'dynamiclibrary_import', "debuginfo_dll"]
 
-        outputFileTags: ["dynamiclibrary", "dynamiclibrary_import", "debuginfo_dll"]
+        outputFileTags: {
+            var tags = ["dynamiclibrary", "dynamiclibrary_import", "debuginfo_dll"];
+            if (shouldSignArtifacts)
+                tags.push("codesign.signed_artifact");
+            return tags;
+        }
         outputArtifacts: {
             var artifacts = [
                 {
-                    fileTags: ["dynamiclibrary"],
+                    fileTags: ["dynamiclibrary"].concat(
+                        product.cpp.shouldSignArtifacts ? ["codesign.signed_artifact"] : []),
                     filePath: product.destinationDirectory + "/" + PathTools.dynamicLibraryFilePath(product)
                 },
                 {