From c705a23aa96850cf1ea6fc9a7817d07d60ec3f4b Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@digia.com>
Date: Thu, 13 Jun 2013 17:53:02 +0200
Subject: [PATCH] Qbs: Fix copying of QbsBuildSteps
This should fix quite a few issues with e.g. changing and cloning kits.
Change-Id: Ia3278ff1a5eb1ab4c019dca5806ce7fc691e4d8e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/qbsprojectmanager/qbsbuildstep.cpp | 4 +++-
src/plugins/qbsprojectmanager/qbsbuildstep.h | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
index 03323156f10..b830ef4cef5 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
@@ -72,7 +72,9 @@ QbsBuildStep::QbsBuildStep(ProjectExplorer::BuildStepList *bsl) :
QbsBuildStep::QbsBuildStep(ProjectExplorer::BuildStepList *bsl, const QbsBuildStep *other) :
ProjectExplorer::BuildStep(bsl, Core::Id(Constants::QBS_BUILDSTEP_ID)),
m_qbsBuildOptions(other->m_qbsBuildOptions), m_job(0), m_parser(0)
-{ }
+{
+ setQbsConfiguration(other->qbsConfiguration());
+}
QbsBuildStep::~QbsBuildStep()
{
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.h b/src/plugins/qbsprojectmanager/qbsbuildstep.h
index 6921a33978e..7f2b73c965b 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.h
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.h
@@ -95,6 +95,8 @@ private:
QVariantMap m_qbsConfiguration;
qbs::BuildOptions m_qbsBuildOptions;
+
+ // Temporary data:
QStringList m_changedFiles;
QStringList m_products;
--
GitLab