aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/runconfiguration.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/projectexplorer/runconfiguration.cpp')
-rw-r--r--src/plugins/projectexplorer/runconfiguration.cpp19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index 50d5ff05b7..ca11b487f8 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -28,6 +28,7 @@
**************************************************************************/
#include "runconfiguration.h"
+
#include "project.h"
#include "persistentsettings.h"
#include "buildconfiguration.h"
@@ -38,8 +39,6 @@
#include <Carbon/Carbon.h>
#endif
-#include <QtDebug>
-
using namespace ProjectExplorer;
// RunConfiguration
@@ -67,27 +66,27 @@ bool RunConfiguration::isEnabled() const
return isEnabled(m_project->activeBuildConfiguration());
}
-QString RunConfiguration::name() const
+QString RunConfiguration::displayName() const
{
- return m_name;
+ return m_displayName;
}
-void RunConfiguration::setName(const QString &name)
+void RunConfiguration::setDisplayName(const QString &name)
{
- m_name = name;
- emit nameChanged();
+ m_displayName = name;
+ emit displayNameChanged();
}
void RunConfiguration::save(PersistentSettingsWriter &writer) const
{
- writer.saveValue("RunConfiguration.name", m_name);
+ writer.saveValue("RunConfiguration.name", m_displayName);
}
void RunConfiguration::restore(const PersistentSettingsReader &reader)
{
QVariant var = reader.restoreValue("RunConfiguration.name");
if (var.isValid() && !var.toString().isEmpty())
- m_name = var.toString();
+ m_displayName = var.toString();
}
@@ -113,7 +112,7 @@ RunControl::RunControl(RunConfiguration *runConfiguration)
: m_runConfiguration(runConfiguration)
{
if (runConfiguration)
- m_displayName = runConfiguration->name();
+ m_displayName = runConfiguration->displayName();
}
RunControl::~RunControl()