From 66c52af89a8a47f537d73153f47bb95aa7c080cb Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 18 Oct 2013 17:45:07 +0200 Subject: [PATCH] Qbs: Do not copy build step and build step list Those are owned by the DeployConfiguration and we should not copy those settings since we may belong to a different DeployConfiguration. Change-Id: Ibb80eb808c8e0f790b35e38bb3dfcf357cf579d2 Reviewed-by: Tobias Hunger --- src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp | 4 ++-- src/plugins/qbsprojectmanager/qbsrunconfiguration.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp index 2a63ac88ec6..697f4606590 100644 --- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp @@ -105,8 +105,8 @@ QbsRunConfiguration::QbsRunConfiguration(ProjectExplorer::Target *parent, QbsRun m_commandLineArguments(source->m_commandLineArguments), m_runMode(source->m_runMode), m_userWorkingDirectory(source->m_userWorkingDirectory), - m_currentInstallStep(source->m_currentInstallStep), - m_currentBuildStepList(source->m_currentBuildStepList) + m_currentInstallStep(0), // no need to copy this, we will get if from the DC anyway. + m_currentBuildStepList(0) // ditto { ctor(); } diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.h b/src/plugins/qbsprojectmanager/qbsrunconfiguration.h index 469c6089cf9..dabc7b7b731 100644 --- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.h +++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.h @@ -131,8 +131,8 @@ private: bool m_userSetName; QString m_userWorkingDirectory; - QbsInstallStep *m_currentInstallStep; - ProjectExplorer::BuildStepList *m_currentBuildStepList; + QbsInstallStep *m_currentInstallStep; // We do not take ownership! + ProjectExplorer::BuildStepList *m_currentBuildStepList; // We do not take ownership! }; class QbsRunConfigurationWidget : public QWidget