feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qbs: Do not copy build step and build step list

Browse Source 
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 <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2013-10-18 17:45:07 +02:00
parent ea6c60cd1b
commit 66c52af89a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
View File

@@ -105,8 +105,8 @@ QbsRunConfiguration::QbsRunConfiguration(ProjectExplorer::Target *parent, QbsRun
m_commandLineArguments(source->m_commandLineArguments), m_commandLineArguments(source->m_commandLineArguments),
m_runMode(source->m_runMode), m_runMode(source->m_runMode),
m_userWorkingDirectory(source->m_userWorkingDirectory), m_userWorkingDirectory(source->m_userWorkingDirectory),
m_currentInstallStep(source->m_currentInstallStep), m_currentInstallStep(0), // no need to copy this, we will get if from the DC anyway.
m_currentBuildStepList(source->m_currentBuildStepList) m_currentBuildStepList(0) // ditto
{ {
ctor(); ctor();
} }

4
src/plugins/qbsprojectmanager/qbsrunconfiguration.h
View File

@@ -131,8 +131,8 @@ private:
bool m_userSetName; bool m_userSetName;
QString m_userWorkingDirectory; QString m_userWorkingDirectory;
QbsInstallStep *m_currentInstallStep; QbsInstallStep *m_currentInstallStep; // We do not take ownership!
ProjectExplorer::BuildStepList *m_currentBuildStepList; ProjectExplorer::BuildStepList *m_currentBuildStepList; // We do not take ownership!
}; };
class QbsRunConfigurationWidget : public QWidget class QbsRunConfigurationWidget : public QWidget