From 82644703460353b05f263c5893bbd822f446072c Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@nokia.com>
Date: Wed, 16 May 2012 11:48:23 +0200
Subject: [PATCH] Ups, unbreak overriding make command
Task-number: QTCREATORBUG-7430
Change-Id: I3e2fa49f749ef33a6abece5d98fd4a1ee6d6e66d
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
---
src/plugins/qt4projectmanager/makestep.cpp | 7 ++++++-
src/plugins/qt4projectmanager/makestep.h | 3 +++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index 4270e6a8c58..f6977b6ded9 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -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();
}
diff --git a/src/plugins/qt4projectmanager/makestep.h b/src/plugins/qt4projectmanager/makestep.h
index 0b9d7346bb5..b902b8b5c76 100644
--- a/src/plugins/qt4projectmanager/makestep.h
+++ b/src/plugins/qt4projectmanager/makestep.h
@@ -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;
--
GitLab