diff --git a/qbs/imports/VDynamicLib.qbs b/qbs/imports/VDynamicLib.qbs index a14df8527..01030dd27 100644 --- a/qbs/imports/VDynamicLib.qbs +++ b/qbs/imports/VDynamicLib.qbs @@ -37,7 +37,7 @@ VLib { windeployqt.languages: i18nconfig.qtTranslationLocales.join(',') } - installDebugInformation: qbs.buildVariant !== "release" || buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled + installDebugInformation: qbs.buildVariant !== "release" || (buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled) Properties { condition: !qbs.targetOS.contains("macos") || (qbs.targetOS.contains("macos") && !buildconfig.enableMultiBundle) @@ -45,8 +45,5 @@ VLib { installDir: buildconfig.installLibraryPath } - Properties { - condition: buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled - qbs.debugInformation: true - } + cpp.debugInformation: qbs.buildVariant !== "release" || (buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled) } diff --git a/qbs/imports/VToolApp.qbs b/qbs/imports/VToolApp.qbs index 5b5a61f93..562302596 100644 --- a/qbs/imports/VToolApp.qbs +++ b/qbs/imports/VToolApp.qbs @@ -12,7 +12,7 @@ VApp { version: buildconfig.projectVersion install: true installDir: buildconfig.installBinaryPath - installDebugInformation: qbs.buildVariant !== "release" || buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled + installDebugInformation: qbs.buildVariant !== "release" || (buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled) consoleApplication: false property bool primaryApp: false @@ -33,10 +33,7 @@ VApp { cpp.dynamicLibraries: ["icudata", "icui18n", "icuuc"] } - Properties { - condition: buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled - qbs.debugInformation: true - } + cpp.debugInformation: qbs.buildVariant !== "release" || (buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled) Group { name: "Translations"