Ups, unbreak overriding make command

Task-number: QTCREATORBUG-7430
Change-Id: I3e2fa49f749ef33a6abece5d98fd4a1ee6d6e66d
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Daniel Teske
2012-05-16 11:48:23 +02:00
parent 60191a68dc
commit 8264470346
2 changed files with 9 additions and 1 deletions
+6 -1
View File
@@ -90,6 +90,11 @@ void MakeStep::ctor()
setDefaultDisplayName(tr("Make", "Qt4 MakeStep display name."));
}
void MakeStep::setMakeCommand(const QString &make)
{
m_makeCmd = make;
}
MakeStep::~MakeStep()
{
}
@@ -495,7 +500,7 @@ void MakeStepConfigWidget::userArgumentsChanged()
void MakeStepConfigWidget::makeEdited()
{
m_makeStep->makeCommand() = m_ui->makePathChooser->rawPath();
m_makeStep->setMakeCommand(m_ui->makePathChooser->rawPath());
updateDetails();
}
+3
View File
@@ -49,6 +49,7 @@ class Project;
namespace Qt4ProjectManager {
class Qt4BuildConfiguration;
class MakeStepConfigWidget;
namespace Internal {
@@ -80,6 +81,7 @@ class QT4PROJECTMANAGER_EXPORT MakeStep : public ProjectExplorer::AbstractProces
{
Q_OBJECT
friend class Internal::MakeStepFactory;
friend class MakeStepConfigWidget;
public:
explicit MakeStep(ProjectExplorer::BuildStepList *bsl);
@@ -111,6 +113,7 @@ protected:
private:
void ctor();
void setMakeCommand(const QString &make);
bool m_clean;
bool m_scriptTarget;
QString m_makeFileToCheck;