From 2bc9373d7b4bf54ecac4c9ea63453d549b2a0dad Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Mon, 2 Jan 2017 13:46:09 +0100
Subject: Use different tags for debug info created by different rules

Otherwise, rule conflicts occur when users try to process the
"debuginfo" artifacts further.

Task-number: QBS-1089
Change-Id: I70141cfbf2a966ab0414cbabab5e4785fd4a96c6
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 share/qbs/modules/cpp/GenericGCC.qbs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'share/qbs/modules/cpp/GenericGCC.qbs')

diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index 0ad21fa96..dbb95ebdf 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -268,7 +268,9 @@ CppModule {
         }
         inputsFromDependencies: ["dynamiclibrary_copy", "staticlibrary"]
 
-        outputFileTags: ["dynamiclibrary", "dynamiclibrary_symlink", "dynamiclibrary_copy", "debuginfo"]
+        outputFileTags: [
+            "dynamiclibrary", "dynamiclibrary_symlink", "dynamiclibrary_copy", "debuginfo_dll"
+        ]
         outputArtifacts: {
             var lib = {
                 filePath: product.destinationDirectory + "/"
@@ -297,7 +299,7 @@ CppModule {
                     artifacts.push(symlink);
                 }
             }
-            return artifacts.concat(Gcc.debugInfoArtifacts(product));
+            return artifacts.concat(Gcc.debugInfoArtifacts(product, "dll"));
         }
 
         prepare: {
@@ -375,14 +377,14 @@ CppModule {
         }
         inputsFromDependencies: ["dynamiclibrary_copy", "staticlibrary"]
 
-        outputFileTags: ["loadablemodule", "debuginfo"]
+        outputFileTags: ["loadablemodule", "debuginfo_loadablemodule"]
         outputArtifacts: {
             var app = {
                 filePath: FileInfo.joinPaths(product.destinationDirectory,
                                              PathTools.loadableModuleFilePath(product)),
                 fileTags: ["loadablemodule"]
             }
-            return [app].concat(Gcc.debugInfoArtifacts(product));
+            return [app].concat(Gcc.debugInfoArtifacts(product, "loadablemodule"));
         }
 
         prepare: {
@@ -403,14 +405,14 @@ CppModule {
         }
         inputsFromDependencies: ["dynamiclibrary_copy", "staticlibrary"]
 
-        outputFileTags: ["application", "debuginfo"]
+        outputFileTags: ["application", "debuginfo_app"]
         outputArtifacts: {
             var app = {
                 filePath: FileInfo.joinPaths(product.destinationDirectory,
                                              PathTools.applicationFilePath(product)),
                 fileTags: ["application"]
             }
-            return [app].concat(Gcc.debugInfoArtifacts(product));
+            return [app].concat(Gcc.debugInfoArtifacts(product, "app"));
         }
 
         prepare: {
-- 
cgit v1.2.3