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

CMakePM: Fix assignment of build system target

Browse Source 
Additionally rename formerly used variable to better express
what it is for.

Change-Id: I6ecf6a5ac30bc411b41a1de3629a27f8882a0a28
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Christian Stenger
2017-03-27 12:08:30 +02:00
parent d2c3cff407
commit a65ce0fe5b
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
View File

@@ -62,7 +62,8 @@ const char TITLE_KEY[] = "CMakeProjectManager.CMakeRunConfiguation.Title";
CMakeRunConfiguration::CMakeRunConfiguration(Target *parent, Core::Id id, const QString &target, CMakeRunConfiguration::CMakeRunConfiguration(Target *parent, Core::Id id, const QString &target,
const Utils::FileName &workingDirectory, const QString &title) : const Utils::FileName &workingDirectory, const QString &title) :
RunConfiguration(parent, id), RunConfiguration(parent, id),
m_buildTarget(target), m_buildSystemTarget(target),
m_executable(target),
m_title(title) m_title(title)
{ {
addExtraAspect(new LocalEnvironmentAspect(this, LocalEnvironmentAspect::BaseEnvironmentModifier())); addExtraAspect(new LocalEnvironmentAspect(this, LocalEnvironmentAspect::BaseEnvironmentModifier()));
@@ -78,7 +79,8 @@ CMakeRunConfiguration::CMakeRunConfiguration(Target *parent, Core::Id id, const
CMakeRunConfiguration::CMakeRunConfiguration(Target *parent, CMakeRunConfiguration *source) : CMakeRunConfiguration::CMakeRunConfiguration(Target *parent, CMakeRunConfiguration *source) :
RunConfiguration(parent, source), RunConfiguration(parent, source),
m_buildTarget(source->m_buildTarget), m_buildSystemTarget(source->m_buildSystemTarget),
m_executable(source->m_executable),
m_title(source->m_title), m_title(source->m_title),
m_enabled(source->m_enabled) m_enabled(source->m_enabled)
{ {
@@ -93,7 +95,7 @@ void CMakeRunConfiguration::ctor()
Runnable CMakeRunConfiguration::runnable() const Runnable CMakeRunConfiguration::runnable() const
{ {
StandardRunnable r; StandardRunnable r;
r.executable = m_buildTarget; r.executable = m_executable;
r.commandLineArguments = extraAspect<ArgumentsAspect>()->arguments(); r.commandLineArguments = extraAspect<ArgumentsAspect>()->arguments();
r.workingDirectory = extraAspect<WorkingDirectoryAspect>()->workingDirectory().toString(); r.workingDirectory = extraAspect<WorkingDirectoryAspect>()->workingDirectory().toString();
r.environment = extraAspect<LocalEnvironmentAspect>()->environment(); r.environment = extraAspect<LocalEnvironmentAspect>()->environment();
@@ -103,9 +105,9 @@ Runnable CMakeRunConfiguration::runnable() const
QString CMakeRunConfiguration::baseWorkingDirectory() const QString CMakeRunConfiguration::baseWorkingDirectory() const
{ {
const QString exe = m_buildTarget; const QString exe = m_executable;
if (!exe.isEmpty()) if (!exe.isEmpty())
return QFileInfo(m_buildTarget).absolutePath(); return QFileInfo(m_executable).absolutePath();
return QString(); return QString();
} }
@@ -116,7 +118,7 @@ QString CMakeRunConfiguration::title() const
void CMakeRunConfiguration::setExecutable(const QString &executable) void CMakeRunConfiguration::setExecutable(const QString &executable)
{ {
m_buildTarget = executable; m_executable = executable;
} }
void CMakeRunConfiguration::setBaseWorkingDirectory(const Utils::FileName &wd) void CMakeRunConfiguration::setBaseWorkingDirectory(const Utils::FileName &wd)

5
src/plugins/cmakeprojectmanager/cmakerunconfiguration.h
View File

@@ -56,7 +56,7 @@ public:
bool isEnabled() const override; bool isEnabled() const override;
QString disabledReason() const override; QString disabledReason() const override;
QString buildSystemTarget() const final { return m_buildTarget; } QString buildSystemTarget() const final { return m_buildSystemTarget; }
protected: protected:
CMakeRunConfiguration(ProjectExplorer::Target *parent, CMakeRunConfiguration *source); CMakeRunConfiguration(ProjectExplorer::Target *parent, CMakeRunConfiguration *source);
@@ -67,7 +67,8 @@ private:
QString baseWorkingDirectory() const; QString baseWorkingDirectory() const;
void ctor(); void ctor();
QString m_buildTarget; const QString m_buildSystemTarget;
QString m_executable;
QString m_title; QString m_title;
bool m_enabled = true; bool m_enabled = true;
}; };