Merge branch 1.15 into master

Change-Id: Iac392a921b5be14f94c8500a057d7045f76db0bf

1 files changed, 8 insertions, 1 deletions

diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index 5ededc512..63d5db7b8 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -561,7 +561,7 @@ CppModule {
         inputsFromDependencies: ["dynamiclibrary_symbols", "dynamiclibrary_import", "staticlibrary"]
 
         outputFileTags: ["bundle.input", "application", "debuginfo_app","debuginfo_bundle",
-                         "debuginfo_plist"]
+                         "debuginfo_plist", "mem_map"]
         outputArtifacts: {
             var app = {
                 filePath: FileInfo.joinPaths(product.destinationDirectory,
@@ -575,6 +575,13 @@ CppModule {
             var artifacts = [app];
             if (!product.aggregate)
                 artifacts = artifacts.concat(Gcc.debugInfoArtifacts(product, undefined, "app"));
+            if (product.cpp.generateLinkerMapFile) {
+                artifacts.push({
+                    filePath: FileInfo.joinPaths(product.destinationDirectory,
+                                                 product.targetName + ".map"),
+                    fileTags: ["mem_map"]
+                });
+            }
             return artifacts;
         }