1 files changed, 30 insertions, 13 deletions

diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index 934636849..6f22ef3e2 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -178,7 +178,6 @@ CppModule {
     property string toolchainPathPrefix: Gcc.pathPrefix(toolchainInstallPath, toolchainPrefix)
     property string binutilsPathPrefix: Gcc.pathPrefix(binutilsPath, toolchainPrefix)
 
-    property string compilerExtension: qbs.hostOS.contains("windows") ? ".exe" : ""
     property string cCompilerName: (qbs.toolchain.contains("clang") ? "clang" : "gcc")
                                    + compilerExtension
     property string cxxCompilerName: (qbs.toolchain.contains("clang") ? "clang++" : "g++")
@@ -205,8 +204,12 @@ CppModule {
     property stringList dsymutilFlags
 
     property bool alwaysUseLipo: false
-    property string includeFlag: "-I"
-    property string systemIncludeFlag: "-isystem"
+    defineFlag: "-D"
+    includeFlag: "-I"
+    systemIncludeFlag: "-isystem"
+    preincludeFlag: "-include"
+    libraryPathFlag: "-L"
+    linkerScriptFlag: "-T"
 
     readonly property bool shouldCreateSymlinks: {
         return createSymlinks && internalVersion && ["macho", "elf"].contains(cpp.imageFormat);
@@ -403,12 +406,14 @@ CppModule {
         }
         inputsFromDependencies: ["dynamiclibrary_symbols", "staticlibrary", "dynamiclibrary_import"]
 
-        outputFileTags: [
-            "bundle.input",
-            "dynamiclibrary", "dynamiclibrary_symlink", "dynamiclibrary_symbols", "debuginfo_dll",
-            "debuginfo_bundle","dynamiclibrary_import", "debuginfo_plist",
-            "codesign.signed_artifact",
-        ]
+        outputFileTags: {
+            var tags = ["bundle.input", "dynamiclibrary", "dynamiclibrary_symlink",
+                        "dynamiclibrary_symbols", "debuginfo_dll", "debuginfo_bundle",
+                        "dynamiclibrary_import", "debuginfo_plist"];
+            if (shouldSignArtifacts)
+                tags.push("codesign.signed_artifact");
+            return tags;
+        }
         outputArtifacts: {
             var artifacts = [{
                 filePath: product.destinationDirectory + "/"
@@ -519,8 +524,13 @@ CppModule {
         }
         inputsFromDependencies: ["dynamiclibrary_symbols", "dynamiclibrary_import", "staticlibrary"]
 
-        outputFileTags: ["bundle.input", "loadablemodule", "debuginfo_loadablemodule",
-                         "debuginfo_bundle", "debuginfo_plist", "codesign.signed_artifact"]
+        outputFileTags: {
+            var tags = ["bundle.input", "loadablemodule", "debuginfo_loadablemodule",
+                        "debuginfo_bundle", "debuginfo_plist"];
+            if (shouldSignArtifacts)
+                tags.push("codesign.signed_artifact");
+            return tags;
+        }
         outputArtifacts: {
             var app = {
                 filePath: FileInfo.joinPaths(product.destinationDirectory,
@@ -559,8 +569,15 @@ CppModule {
         }
         inputsFromDependencies: ["dynamiclibrary_symbols", "dynamiclibrary_import", "staticlibrary"]
 
-        outputFileTags: ["bundle.input", "application", "debuginfo_app", "debuginfo_bundle",
-                         "debuginfo_plist", "mem_map", "codesign.signed_artifact"]
+        outputFileTags: {
+            var tags = ["bundle.input", "application", "debuginfo_app", "debuginfo_bundle",
+                        "debuginfo_plist"];
+            if (shouldSignArtifacts)
+                tags.push("codesign.signed_artifact");
+            if (generateLinkerMapFile)
+                tags.push("mem_map");
+            return tags;
+        }
         outputArtifacts: {
             var app = {
                 filePath: FileInfo.joinPaths(product.destinationDirectory,