From 11ffd3d702e2223f95fb8c5f69edbaa3fa7fe4f3 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 27 Jul 2018 14:05:23 +0200 Subject: [PATCH] QbsProjectManager: Add run config checkbox for using debug frameworks As it already exists in the qmake project manager. Task-number: QTCREATORBUG-20411 Change-Id: I8673e091b3f5772fdc1ddcac0e567f690960f1dd Reviewed-by: Alexandru Croitor --- src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp index 08c9707fec4..e2d2f56d35b 100644 --- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp @@ -69,6 +69,12 @@ QbsRunConfiguration::QbsRunConfiguration(Target *target, Core::Id id) addExtraAspect(libAspect); connect(libAspect, &UseLibraryPathsAspect::changed, envAspect, &EnvironmentAspect::environmentChanged); + if (HostOsInfo::isMacHost()) { + auto dyldAspect = new UseDyldSuffixAspect(this, "Qbs.RunConfiguration.UseDyldImageSuffix"); + addExtraAspect(dyldAspect); + connect(dyldAspect, &UseDyldSuffixAspect::changed, + envAspect, &EnvironmentAspect::environmentChanged); + } connect(project(), &Project::parsingFinished, this, [envAspect]() { envAspect->buildEnvironmentHasChanged(); }); @@ -109,6 +115,10 @@ void QbsRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo & void QbsRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const { + if (auto dyldAspect = extraAspect()) { + if (dyldAspect->value()) + env.set("DYLD_IMAGE_SUFFIX", "_debug"); + } bool usingLibraryPaths = extraAspect()->value(); const auto key = qMakePair(env.toStringList(), usingLibraryPaths);