Commit 82644703 authored by Daniel Teske's avatar Daniel Teske
Browse files

Ups, unbreak overriding make command



Task-number: QTCREATORBUG-7430
Change-Id: I3e2fa49f749ef33a6abece5d98fd4a1ee6d6e66d
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent 60191a68
......@@ -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();
}
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment