diff --git a/qbs/modules/multibundle/multibundle.qbs b/qbs/modules/multibundle/multibundle.qbs index a7aa792b6..6d0cfd125 100644 --- a/qbs/modules/multibundle/multibundle.qbs +++ b/qbs/modules/multibundle/multibundle.qbs @@ -20,7 +20,7 @@ Module { product.multibundle.targetApps.forEach(function(targetApp) { artifactNames.push(installRoot + "/" + targetApp + ".app/Contents/Frameworks/" + fileName); - if (product.installDebugInformation) + if (product.installDebugInformation && !(buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled)) artifactNames.push(installRoot + "/" + targetApp + ".app/Contents/Frameworks/" + fileName + product.cpp.debugInfoBundleSuffix); }); @@ -48,7 +48,7 @@ Module { "destination": installRoot + "/" + targetApp + ".app/Contents/Frameworks/" + fileName }); - if (product.installDebugInformation) + if (product.installDebugInformation && !(buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled)) data.push({ "source" : product.buildDirectory + "/" + fileName + product.cpp.debugInfoBundleSuffix, "destination": installRoot + "/" + targetApp + ".app/Contents/Frameworks/" + fileName + @@ -79,7 +79,7 @@ Module { product.multibundle.targetApps.forEach(function(targetApp) { artifactNames.push(installRoot + "/" + targetApp + ".app/Contents/MacOS/" + input.fileName); - if (product.installDebugInformation) + if (product.installDebugInformation && !(buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled)) artifactNames.push(installRoot + "/" + targetApp + ".app/Contents/MacOS/" + input.fileName + ".app" + product.cpp.debugInfoBundleSuffix); });