diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 833324cd7c146666f96f4a0c9a7c5f44700afd93..3afa31078d18e7a22bcce0309de4461014d10b9e 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -475,13 +475,6 @@ GenericBuildSettingsWidget::GenericBuildSettingsWidget(GenericProject *project)
fl->setContentsMargins(0, -1, 0, -1);
fl->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
- // Configuration name
- m_nameLineEdit = new QLineEdit;
- fl->addRow(tr("Configuration Name:"), m_nameLineEdit);
-
- connect(m_nameLineEdit, SIGNAL(textEdited(QString)),
- this, SLOT(configNameEdited(QString)));
-
// build directory
m_pathChooser = new Utils::PathChooser(this);
m_pathChooser->setEnabled(true);
@@ -515,15 +508,9 @@ QString GenericBuildSettingsWidget::displayName() const
void GenericBuildSettingsWidget::init(BuildConfiguration *bc)
{
m_buildConfiguration = static_cast<GenericBuildConfiguration *>(bc);
- m_nameLineEdit->setText(m_buildConfiguration->displayName());
m_pathChooser->setPath(m_buildConfiguration->rawBuildDirectory());
}
-void GenericBuildSettingsWidget::configNameEdited(const QString &name)
-{
- m_buildConfiguration->setDisplayName(name);
-}
-
void GenericBuildSettingsWidget::buildDirectoryChanged()
{
m_buildConfiguration->setBuildDirectory(m_pathChooser->path());
diff --git a/src/plugins/genericprojectmanager/genericproject.h b/src/plugins/genericprojectmanager/genericproject.h
index d912192fb08a840bd10fe583624fa79adcc79cdd..2f76d591be916c9ae06416caf18fed9e8ad2bab5 100644
--- a/src/plugins/genericprojectmanager/genericproject.h
+++ b/src/plugins/genericprojectmanager/genericproject.h
@@ -184,13 +184,11 @@ public:
virtual void init(ProjectExplorer::BuildConfiguration *bc);
private Q_SLOTS:
- void configNameEdited(const QString &name);
void buildDirectoryChanged();
void toolChainSelected(int index);
private:
GenericProject *m_project;
- QLineEdit *m_nameLineEdit;
Utils::PathChooser *m_pathChooser;
GenericBuildConfiguration *m_buildConfiguration;
};
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
index 515f255c648c260e6bf6bd935c432b982a09e736..461b0bde5133b39269289de94a8388405c7bf87f 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
@@ -59,8 +59,6 @@ const char * const EXECUTABLE_KEY("ProjectExplorer.CustomExecutableRunConfigurat
const char * const ARGUMENTS_KEY("ProjectExplorer.CustomExecutableRunConfiguration.Arguments");
const char * const WORKING_DIRECTORY_KEY("ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory");
const char * const USE_TERMINAL_KEY("ProjectExplorer.CustomExecutableRunConfiguration.UseTerminal");
-const char * const USER_SET_NAME_KEY("ProjectExplorer.CustomExecutableRunConfiguration.UserSetName");
-const char * const USER_NAME_KEY("ProjectExplorer.CustomExecutableRunConfiguration.UserName");
const char * const USER_ENVIRONMENT_CHANGES_KEY("ProjectExplorer.CustomExecutableRunConfiguration.UserEnvironmentChanges");
const char * const BASE_ENVIRONMENT_BASE_KEY("ProjectExplorer.CustomExecutableRunConfiguration.BaseEnvironmentBase");
@@ -89,9 +87,6 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE
layout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
layout->setMargin(0);
- m_userName = new QLineEdit(this);
- layout->addRow(tr("Name:"), m_userName);
-
m_executableChooser = new Utils::PathChooser(this);
m_executableChooser->setExpectedKind(Utils::PathChooser::Command);
layout->addRow(tr("Executable:"), m_executableChooser);
@@ -150,8 +145,6 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE
changed();
- connect(m_userName, SIGNAL(textEdited(QString)),
- this, SLOT(userNameEdited(QString)));
connect(m_executableChooser, SIGNAL(changed(QString)),
this, SLOT(executableEdited()));
connect(m_commandLineArgumentsLineEdit, SIGNAL(textEdited(const QString&)),
@@ -224,13 +217,6 @@ void CustomExecutableConfigurationWidget::workingDirectoryEdited()
m_ignoreChange = false;
}
-void CustomExecutableConfigurationWidget::userNameEdited(const QString &name)
-{
- m_ignoreChange = true;
- m_runConfiguration->setUserName(name);
- m_ignoreChange = false;
-}
-
void CustomExecutableConfigurationWidget::termToggled(bool on)
{
m_ignoreChange = true;
@@ -255,15 +241,11 @@ void CustomExecutableConfigurationWidget::changed()
m_commandLineArgumentsLineEdit->setText(ProjectExplorer::Environment::joinArgumentList(m_runConfiguration->commandLineArguments()));
m_workingDirectory->setPath(m_runConfiguration->baseWorkingDirectory());
m_useTerminalCheck->setChecked(m_runConfiguration->runMode() == LocalApplicationRunConfiguration::Console);
- m_userName->setText(m_runConfiguration->userName());
}
void CustomExecutableRunConfiguration::ctor()
{
- if (m_userSetName)
- setDisplayName(m_userName);
- else
- setDisplayName(tr("Custom Executable"));
+ setDisplayName(tr("Run %1").arg(m_executable));
connect(target(), SIGNAL(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)),
this, SLOT(activeBuildConfigurationChanged()));
@@ -278,7 +260,6 @@ void CustomExecutableRunConfiguration::ctor()
CustomExecutableRunConfiguration::CustomExecutableRunConfiguration(Target *parent) :
LocalApplicationRunConfiguration(parent, QLatin1String(CUSTOM_EXECUTABLE_ID)),
m_runMode(Gui),
- m_userSetName(false),
m_baseEnvironmentBase(CustomExecutableRunConfiguration::BuildEnvironmentBase)
{
m_workingDirectory = QLatin1String(DEFAULT_WORKING_DIR);
@@ -291,8 +272,6 @@ CustomExecutableRunConfiguration::CustomExecutableRunConfiguration(Target *paren
m_workingDirectory(source->m_workingDirectory),
m_cmdArguments(source->m_cmdArguments),
m_runMode(source->m_runMode),
- m_userSetName(source->m_userSetName),
- m_userName(source->m_userName),
m_userEnvironmentChanges(source->m_userEnvironmentChanges),
m_baseEnvironmentBase(source->m_baseEnvironmentBase)
{
@@ -321,11 +300,6 @@ QString CustomExecutableRunConfiguration::baseExecutable() const
return m_executable;
}
-QString CustomExecutableRunConfiguration::userName() const
-{
- return m_userName;
-}
-
QString CustomExecutableRunConfiguration::executable() const
{
QString exec;
@@ -468,8 +442,6 @@ QVariantMap CustomExecutableRunConfiguration::toMap() const
map.insert(QLatin1String(ARGUMENTS_KEY), m_cmdArguments);
map.insert(QLatin1String(WORKING_DIRECTORY_KEY), m_workingDirectory);
map.insert(QLatin1String(USE_TERMINAL_KEY), m_runMode == Console);
- map.insert(QLatin1String(USER_SET_NAME_KEY), m_userSetName);
- map.insert(QLatin1String(USER_NAME_KEY), m_userName);
map.insert(QLatin1String(USER_ENVIRONMENT_CHANGES_KEY), ProjectExplorer::EnvironmentItem::toStringList(m_userEnvironmentChanges));
map.insert(QLatin1String(BASE_ENVIRONMENT_BASE_KEY), static_cast<int>(m_baseEnvironmentBase));
return map;
@@ -481,8 +453,6 @@ bool CustomExecutableRunConfiguration::fromMap(const QVariantMap &map)
m_cmdArguments = map.value(QLatin1String(ARGUMENTS_KEY)).toStringList();
m_workingDirectory = map.value(QLatin1String(WORKING_DIRECTORY_KEY)).toString();
m_runMode = map.value(QLatin1String(USE_TERMINAL_KEY)).toBool() ? Console : Gui;
- m_userSetName = map.value(QLatin1String(USER_SET_NAME_KEY)).toBool();
- m_userName = map.value(QLatin1String(USER_NAME_KEY)).toString();
m_userEnvironmentChanges = ProjectExplorer::EnvironmentItem::fromStringList(map.value(QLatin1String(USER_ENVIRONMENT_CHANGES_KEY)).toStringList());
m_baseEnvironmentBase = static_cast<BaseEnvironmentBase>(map.value(QLatin1String(BASE_ENVIRONMENT_BASE_KEY), static_cast<int>(CustomExecutableRunConfiguration::BuildEnvironmentBase)).toInt());
@@ -491,8 +461,9 @@ bool CustomExecutableRunConfiguration::fromMap(const QVariantMap &map)
void CustomExecutableRunConfiguration::setExecutable(const QString &executable)
{
+ bool hasUserName = (displayName() != tr("Run %1").arg(m_executable));
m_executable = executable;
- if (!m_userSetName)
+ if (!hasUserName)
setDisplayName(tr("Run %1").arg(m_executable));
emit changed();
}
@@ -520,20 +491,6 @@ QWidget *CustomExecutableRunConfiguration::createConfigurationWidget()
return new CustomExecutableConfigurationWidget(this);
}
-void CustomExecutableRunConfiguration::setUserName(const QString &name)
-{
- if (name.isEmpty()) {
- m_userName = name;
- m_userSetName = false;
- setDisplayName(tr("Run %1").arg(m_executable));
- } else {
- m_userName = name;
- m_userSetName = true;
- setDisplayName(name);
- }
- emit changed();
-}
-
QString CustomExecutableRunConfiguration::dumperLibrary() const
{
QString qmakePath = ProjectExplorer::DebuggingHelperLibrary::findSystemQt(environment());
@@ -577,7 +534,6 @@ RunConfiguration *CustomExecutableRunConfigurationFactory::create(Target *parent
return 0;
RunConfiguration *rc(new CustomExecutableRunConfiguration(parent));
- rc->setDisplayName(tr("Custom Executable"));
return rc;
}
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.h b/src/plugins/projectexplorer/customexecutablerunconfiguration.h
index a766529d8a502e522bd51c4f47994924a043eeef..ceec4f23164ad8be9c839f2a2d318f5aa17dd2e5 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.h
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.h
@@ -181,7 +181,6 @@ private slots:
void executableEdited();
void argumentsEdited(const QString &arguments);
- void userNameEdited(const QString &name);
void workingDirectoryEdited();
void termToggled(bool);
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
index a0d962ec4b03e42ab9d968fe317a44429c03c312..852e0720c732af5436692a4d400ea6810c8c0c17 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp
@@ -97,8 +97,6 @@ void MaemoRunConfigurationWidget::addGenericWidgets(QVBoxLayout *mainLayout)
QFormLayout *formLayout = new QFormLayout;
mainLayout->addLayout(formLayout);
formLayout->setFormAlignment(Qt::AlignLeft | Qt::AlignVCenter);
- m_configNameLineEdit = new QLineEdit(m_runConfiguration->displayName());
- formLayout->addRow(tr("Run configuration name:"), m_configNameLineEdit);
QWidget *devConfWidget = new QWidget;
QHBoxLayout *devConfLayout = new QHBoxLayout(devConfWidget);
@@ -128,8 +126,6 @@ void MaemoRunConfigurationWidget::addGenericWidgets(QVBoxLayout *mainLayout)
SLOT(showSettingsDialog(QString)));
connect(debuggerConfLabel, SIGNAL(linkActivated(QString)), this,
SLOT(showSettingsDialog(QString)));
- connect(m_configNameLineEdit, SIGNAL(textEdited(QString)), this,
- SLOT(configNameEdited(QString)));
connect(m_argsLineEdit, SIGNAL(textEdited(QString)), this,
SLOT(argumentsEdited(QString)));
connect(m_runConfiguration, SIGNAL(targetInformationChanged()), this,
@@ -250,11 +246,6 @@ void MaemoRunConfigurationWidget::addEnvironmentWidgets(QVBoxLayout *mainLayout)
connect(m_deviceEnvReader, SIGNAL(finished()), this, SLOT(fetchEnvironmentFinished()));
}
-void MaemoRunConfigurationWidget::configNameEdited(const QString &text)
-{
- m_runConfiguration->setDisplayName(text);
-}
-
void MaemoRunConfigurationWidget::argumentsEdited(const QString &text)
{
m_runConfiguration->setArguments(text.split(' ', QString::SkipEmptyParts));
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h
index 17e13f486d9940862fd2e961e30ea5f97f585062..303102f165b5c06f0372677d76771aa800159590 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.h
@@ -70,7 +70,6 @@ public:
QWidget *parent = 0);
private slots:
- void configNameEdited(const QString &text);
void argumentsEdited(const QString &args);
void showSettingsDialog(const QString &link);
void updateTargetInformation();
@@ -99,7 +98,6 @@ private:
void addEnvironmentWidgets(QVBoxLayout *mainLayout);
void updateMountWarning();
- QLineEdit *m_configNameLineEdit;
QLineEdit *m_argsLineEdit;
QLabel *m_localExecutableLabel;
QLabel *m_remoteExecutableLabel;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
index 0ad7492502c214253e56ae57d0b0b36f39d74335..cefc6aa2c0d35025ccfa8cf45ac4650aa498bf6f 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
@@ -52,7 +52,6 @@ S60DeviceRunConfigurationWidget::S60DeviceRunConfigurationWidget(
: QWidget(parent),
m_runConfiguration(runConfiguration),
m_detailsWidget(new Utils::DetailsWidget),
- m_nameLineEdit(new QLineEdit(m_runConfiguration->displayName())),
m_argumentsLineEdit(new QLineEdit(m_runConfiguration->commandLineArguments().join(QString(QLatin1Char(' ')))))
{
m_detailsWidget->setState(Utils::DetailsWidget::NoSummary);
@@ -70,23 +69,12 @@ S60DeviceRunConfigurationWidget::S60DeviceRunConfigurationWidget(
QFormLayout *formLayout = new QFormLayout();
formLayout->setMargin(0);
detailsBoxLayout->addLayout(formLayout);
- // Name control
- QLabel *nameLabel = new QLabel(tr("Name:"));
- nameLabel->setBuddy(m_nameLineEdit);
- formLayout->addRow(nameLabel, m_nameLineEdit);
formLayout->addRow(tr("Arguments:"), m_argumentsLineEdit);
- connect(m_nameLineEdit, SIGNAL(textEdited(QString)),
- this, SLOT(displayNameEdited(QString)));
connect(m_argumentsLineEdit, SIGNAL(textEdited(QString)),
this, SLOT(argumentsEdited(QString)));
}
-void S60DeviceRunConfigurationWidget::displayNameEdited(const QString &text)
-{
- m_runConfiguration->setDisplayName(text);
-}
-
void S60DeviceRunConfigurationWidget::argumentsEdited(const QString &text)
{
const QString trimmed = text.trimmed();
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h
index ff7fc2c51d53dc29a70352bd77d8814d54c4d11d..bd640fc4742b098859d2d3c682de4fb2debc01a0 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.h
@@ -53,13 +53,11 @@ public:
QWidget *parent = 0);
private slots:
- void displayNameEdited(const QString &text);
void argumentsEdited(const QString &text);
private:
S60DeviceRunConfiguration *m_runConfiguration;
Utils::DetailsWidget *m_detailsWidget;
- QLineEdit *m_nameLineEdit;
QLineEdit *m_argumentsLineEdit;
};
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
index c828a7f4f946d42ab394d1995322d30b7d50a9b4..83028f3db2c6dbdb8e8fbed4881488b55da1def7 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
@@ -179,7 +179,6 @@ S60EmulatorRunConfigurationWidget::S60EmulatorRunConfigurationWidget(S60Emulator
: QWidget(parent),
m_runConfiguration(runConfiguration),
m_detailsWidget(new Utils::DetailsWidget),
- m_nameLineEdit(new QLineEdit(m_runConfiguration->displayName())),
m_executableLabel(new QLabel(m_runConfiguration->executable()))
{
m_detailsWidget->setState(Utils::DetailsWidget::NoSummary);
@@ -194,24 +193,12 @@ S60EmulatorRunConfigurationWidget::S60EmulatorRunConfigurationWidget(S60Emulator
detailsFormLayout->setMargin(0);
detailsContainer->setLayout(detailsFormLayout);
- QLabel *nameLabel = new QLabel(tr("Name:"));
-
- nameLabel->setBuddy(m_nameLineEdit);
- detailsFormLayout->addRow(nameLabel, m_nameLineEdit);
-
detailsFormLayout->addRow(tr("Executable:"), m_executableLabel);
- connect(m_nameLineEdit, SIGNAL(textEdited(QString)),
- this, SLOT(displayNameEdited(QString)));
connect(m_runConfiguration, SIGNAL(targetInformationChanged()),
this, SLOT(updateTargetInformation()));
}
-void S60EmulatorRunConfigurationWidget::displayNameEdited(const QString &text)
-{
- m_runConfiguration->setDisplayName(text);
-}
-
void S60EmulatorRunConfigurationWidget::updateTargetInformation()
{
m_executableLabel->setText(m_runConfiguration->executable());
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
index ccf2a372ee2c8ace8a162545dd1f14a911f17a29..39d1911d84153e935da7f9d5d119ac1614ae46ea 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
@@ -98,13 +98,11 @@ public:
QWidget *parent = 0);
private slots:
- void displayNameEdited(const QString &text);
void updateTargetInformation();
private:
S60EmulatorRunConfiguration *m_runConfiguration;
Utils::DetailsWidget *m_detailsWidget;
- QLineEdit *m_nameLineEdit;
QLabel *m_executableLabel;
};
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index b891a0eee3ff48fba17b39ed26e0ebf3ef2c2425..d861dd2eee0fbf7eea59bd21cdf5135d7cb9ba4d 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -79,9 +79,6 @@ Qt4ProjectConfigWidget::Qt4ProjectConfigWidget(Qt4Project *project)
m_ui->shadowBuildDirEdit->setExpectedKind(Utils::PathChooser::Directory);
m_ui->invalidQtWarningLabel->setVisible(false);
- connect(m_ui->nameLineEdit, SIGNAL(textEdited(QString)),
- this, SLOT(configNameEdited(QString)));
-
connect(m_ui->shadowBuildCheckBox, SIGNAL(clicked(bool)),
this, SLOT(shadowBuildClicked(bool)));
@@ -192,8 +189,6 @@ void Qt4ProjectConfigWidget::init(ProjectExplorer::BuildConfiguration *bc)
connect(m_buildConfiguration, SIGNAL(toolChainTypeChanged()),
this, SLOT(toolChainTypeChanged()));
- m_ui->nameLineEdit->setText(m_buildConfiguration->displayName());
-
qtVersionsChanged();
QtVersionManager *vm = QtVersionManager::instance();
connect(vm, SIGNAL(qtVersionsChanged(QList<int>)),
@@ -225,11 +220,6 @@ void Qt4ProjectConfigWidget::qtVersionChanged()
updateDetails();
}
-void Qt4ProjectConfigWidget::configNameEdited(const QString &newName)
-{
- m_buildConfiguration->setDisplayName(newName);
-}
-
void Qt4ProjectConfigWidget::qtVersionsChanged()
{
m_ignoreChange = true;
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.h b/src/plugins/qt4projectmanager/qt4projectconfigwidget.h
index c524f5f577be35c83dfb9b11203e032724b49841..abfb634039210ecc19350103ed5402a47c18f59e 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.h
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.h
@@ -63,7 +63,6 @@ public:
private slots:
// User changes in our widgets
- void configNameEdited(const QString &newName);
void shadowBuildClicked(bool checked);
void onBeforeBeforeShadowBuildDirBrowsed();
void shadowBuildEdited();
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui b/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui
index 4188ffbfc4b9c2655df1576c95946025fa4b75f1..a7a2444119a6b969427d7204c21c15550993a235 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui
@@ -7,28 +7,11 @@
<x>0</x>
<y>0</y>
<width>712</width>
- <height>194</height>
+ <height>153</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
- <widget class="QLabel" name="nameLabel">
- <property name="text">
- <string>Configuration name:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="nameLineEdit">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>100</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
<widget class="QLabel" name="qtVersionLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
@@ -41,7 +24,7 @@
</property>
</widget>
</item>
- <item row="1" column="1">
+ <item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>4</number>
@@ -78,31 +61,31 @@
</item>
</layout>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_2">
+ <item row="1" column="0">
+ <widget class="QLabel" name="toolchainLabel">
<property name="text">
<string>Tool chain:</string>
</property>
</widget>
</item>
- <item row="2" column="1">
+ <item row="1" column="1">
<widget class="QComboBox" name="toolChainComboBox"/>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="label">
+ <item row="2" column="0">
+ <widget class="QLabel" name="shadowBuildLabel">
<property name="text">
<string>Shadow build:</string>
</property>
</widget>
</item>
- <item row="3" column="1">
+ <item row="2" column="1">
<widget class="QCheckBox" name="shadowBuildCheckBox">
<property name="text">
<string/>
</property>
</widget>
</item>
- <item row="4" column="0">
+ <item row="3" column="0">
<widget class="QLabel" name="buildDirLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -115,7 +98,7 @@
</property>
</widget>
</item>
- <item row="4" column="1">
+ <item row="3" column="1">
<widget class="Utils::PathChooser" name="shadowBuildDirEdit" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -125,7 +108,7 @@
</property>
</widget>
</item>
- <item row="5" column="1">
+ <item row="4" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="importLabel">
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index 2a97ea2cbde80d5f93686136d037f87580011ef6..ec40f288f30f0021642462e5b0c5c360cc432b25 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -53,6 +53,7 @@
#include <QtGui/QFormLayout>
#include <QtGui/QInputDialog>
#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
#include <QtGui/QCheckBox>
#include <QtGui/QToolButton>
#include <QtGui/QComboBox>
@@ -69,7 +70,6 @@ const char * const QT4_RC_PREFIX("Qt4ProjectManager.Qt4RunConfiguration.");
const char * const COMMAND_LINE_ARGUMENTS_KEY("Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments");
const char * const PRO_FILE_KEY("Qt4ProjectManager.Qt4RunConfiguration.ProFile");
-const char * const USER_SET_NAME_KEY("Qt4ProjectManager.Qt4RunConfiguration.UserSetName");
const char * const USE_TERMINAL_KEY("Qt4ProjectManager.Qt4RunConfiguration.UseTerminal");
const char * const USE_DYLD_IMAGE_SUFFIX_KEY("Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix");
const char * const USER_ENVIRONMENT_CHANGES_KEY("Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges");
@@ -99,7 +99,6 @@ Qt4RunConfiguration::Qt4RunConfiguration(Qt4Target *parent, const QString &proFi
LocalApplicationRunConfiguration(parent, QLatin1String(QT4_RC_ID)),
m_proFilePath(proFilePath),
m_runMode(Gui),
- m_userSetName(false),
m_isUsingDyldImageSuffix(false),
m_userSetWokingDirectory(false),
m_baseEnvironmentBase(Qt4RunConfiguration::BuildEnvironmentBase)
@@ -112,7 +111,6 @@ Qt4RunConfiguration::Qt4RunConfiguration(Qt4Target *parent, Qt4RunConfiguration
m_commandLineArguments(source->m_commandLineArguments),
m_proFilePath(source->m_proFilePath),
m_runMode(source->m_runMode),
- m_userSetName(source->m_userSetName),
m_isUsingDyldImageSuffix(source->m_isUsingDyldImageSuffix),
m_userSetWokingDirectory(source->m_userSetWokingDirectory),
m_userWorkingDirectory(source->m_userWorkingDirectory),
@@ -165,7 +163,10 @@ void Qt4RunConfiguration::proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileN
void Qt4RunConfiguration::ctor()
{
- setDefaultDisplayName();
+ QString name = defaultDisplayName();
+ if (name != displayName())
+ setDisplayName(name);
+
connect(qt4Target(), SIGNAL(environmentChanged()),
this, SIGNAL(baseEnvironmentChanged()));
@@ -196,13 +197,9 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
toplayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
toplayout->setMargin(0);
- QLabel *nameLabel = new QLabel(tr("Name:"), this);
- m_nameLineEdit = new QLineEdit(m_qt4RunConfiguration->displayName(), this);
- nameLabel->setBuddy(m_nameLineEdit);
- toplayout->addRow(nameLabel, m_nameLineEdit);
-
- m_executableLabel = new QLabel(m_qt4RunConfiguration->executable(), this);
- toplayout->addRow(tr("Executable:"), m_executableLabel);
+ m_executableLineEdit = new QLineEdit(m_qt4RunConfiguration->executable(), this);
+ m_executableLineEdit->setEnabled(false);
+ toplayout->addRow(tr("Executable:"), m_executableLineEdit);
QLabel *argumentsLabel = new QLabel(tr("Arguments:"), this);
m_argumentsLineEdit = new QLineEdit(ProjectExplorer::Environment::joinArgumentList(qt4RunConfiguration->commandLineArguments()), this);
@@ -275,8 +272,6 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
connect(m_argumentsLineEdit, SIGNAL(textEdited(QString)),
this, SLOT(argumentsEdited(QString)));
- connect(m_nameLineEdit, SIGNAL(textEdited(QString)),
- this, SLOT(displayNameEdited(QString)));
connect(m_useTerminalCheck, SIGNAL(toggled(bool)),
this, SLOT(termToggled(bool)));
@@ -288,8 +283,6 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
connect(qt4RunConfiguration, SIGNAL(commandLineArgumentsChanged(QString)),
this, SLOT(commandLineArgumentsChanged(QString)));
- connect(qt4RunConfiguration, SIGNAL(displayNameChanged()),
- this, SLOT(displayNameChanged()));
connect(qt4RunConfiguration, SIGNAL(runModeChanged(ProjectExplorer::LocalApplicationRunConfiguration::RunMode)),
this, SLOT(runModeChanged(ProjectExplorer::LocalApplicationRunConfiguration::RunMode)));
connect(qt4RunConfiguration, SIGNAL(usingDyldImageSuffixChanged(bool)),
@@ -365,13 +358,6 @@ void Qt4RunConfigurationWidget::argumentsEdited(const QString &args)
m_ignoreChange = false;
}
-void Qt4RunConfigurationWidget::displayNameEdited(const QString &name)
-{
- m_ignoreChange = true;
- m_qt4RunConfiguration->setUserName(name);
- m_ignoreChange = false;
-}
-
void Qt4RunConfigurationWidget::termToggled(bool on)
{
m_ignoreChange = true;
@@ -400,12 +386,6 @@ void Qt4RunConfigurationWidget::commandLineArgumentsChanged(const QString &args)
m_argumentsLineEdit->setText(args);
}
-void Qt4RunConfigurationWidget::displayNameChanged()
-{
- if (!m_ignoreChange)
- m_nameLineEdit->setText(m_qt4RunConfiguration->displayName());
-}
-
void Qt4RunConfigurationWidget::runModeChanged(LocalApplicationRunConfiguration::RunMode runMode)
{
if (!m_ignoreChange)
@@ -421,7 +401,7 @@ void Qt4RunConfigurationWidget::usingDyldImageSuffixChanged(bool state)
void Qt4RunConfigurationWidget::effectiveTargetInformationChanged()
{
if (m_isShown) {
- m_executableLabel->setText(QDir::toNativeSeparators(m_qt4RunConfiguration->executable()));
+ m_executableLineEdit->setText(QDir::toNativeSeparators(m_qt4RunConfiguration->executable()));
m_ignoreChange = true;
m_workingDirectoryEdit->setPath(QDir::toNativeSeparators(m_qt4RunConfiguration->workingDirectory()));
m_ignoreChange = false;
@@ -453,7 +433,6 @@ QVariantMap Qt4RunConfiguration::toMap() const
QVariantMap map(LocalApplicationRunConfiguration::toMap());
map.insert(QLatin1String(COMMAND_LINE_ARGUMENTS_KEY), m_commandLineArguments);
map.insert(QLatin1String(PRO_FILE_KEY), projectDir.relativeFilePath(m_proFilePath));
- map.insert(QLatin1String(USER_SET_NAME_KEY), m_userSetName);
map.insert(QLatin1String(USE_TERMINAL_KEY), m_runMode == Console);
map.insert(QLatin1String(USE_DYLD_IMAGE_SUFFIX_KEY), m_isUsingDyldImageSuffix);
map.insert(QLatin1String(USER_ENVIRONMENT_CHANGES_KEY), ProjectExplorer::EnvironmentItem::toStringList(m_userEnvironmentChanges));
@@ -468,20 +447,16 @@ bool Qt4RunConfiguration::fromMap(const QVariantMap &map)
const QDir projectDir = QDir(target()->project()->projectDirectory());
m_commandLineArguments = map.value(QLatin1String(COMMAND_LINE_ARGUMENTS_KEY)).toStringList();
m_proFilePath = projectDir.filePath(map.value(QLatin1String(PRO_FILE_KEY)).toString());
- m_userSetName = map.value(QLatin1String(USER_SET_NAME_KEY), false).toBool();
m_runMode = map.value(QLatin1String(USE_TERMINAL_KEY), false).toBool() ? Console : Gui;
m_isUsingDyldImageSuffix = map.value(QLatin1String(USE_DYLD_IMAGE_SUFFIX_KEY), false).toBool();
m_userSetWokingDirectory = map.value(QLatin1String(USER_SET_WORKING_DIRECTORY_KEY), false).toBool();
m_userWorkingDirectory = map.value(QLatin1String(USER_WORKING_DIRECTORY_KEY)).toString();
- if (!m_proFilePath.isEmpty()) {
- if (!m_userSetName)
- setDefaultDisplayName();
- }
m_userEnvironmentChanges = ProjectExplorer::EnvironmentItem::fromStringList(map.value(QLatin1String(USER_ENVIRONMENT_CHANGES_KEY)).toStringList());
m_baseEnvironmentBase = static_cast<BaseEnvironmentBase>(map.value(QLatin1String(BASE_ENVIRONMENT_BASE_KEY), static_cast<int>(Qt4RunConfiguration::BuildEnvironmentBase)).toInt());
+ // This will restore the display name for us:
return RunConfiguration::fromMap(map);
}
@@ -611,17 +586,6 @@ void Qt4RunConfiguration::setRunMode(RunMode runMode)
emit runModeChanged(runMode);
}
-void Qt4RunConfiguration::setUserName(const QString &name)
-{
- if (name.isEmpty()) {
- m_userSetName = false;
- setDefaultDisplayName();
- } else {
- m_userSetName = true;
- setDisplayName(name);
- }
-}
-
QString Qt4RunConfiguration::proFilePath() const
{
return m_proFilePath;
@@ -643,14 +607,14 @@ QStringList Qt4RunConfiguration::dumperLibraryLocations() const
return QStringList();
}
-void Qt4RunConfiguration::setDefaultDisplayName()
+QString Qt4RunConfiguration::defaultDisplayName()
{
- if (m_userSetName)
- return;
+ QString defaultName;
if (!m_proFilePath.isEmpty())
- setDisplayName(QFileInfo(m_proFilePath).completeBaseName());
+ defaultName = QFileInfo(m_proFilePath).completeBaseName();
else
- setDisplayName(tr("Qt4 RunConfiguration"));
+ defaultName = tr("Qt4 RunConfiguration");
+ return defaultName;
}
void Qt4RunConfiguration::setBaseEnvironmentBase(BaseEnvironmentBase env)
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt4runconfiguration.h
index 882131c5c5b4bce18739033a176502270626b300..99031e84958655020c0c675721ed34ed46057a40 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.h
@@ -36,7 +36,6 @@
QT_BEGIN_NAMESPACE
class QCheckBox;
-class QLabel;
class QLineEdit;
class QRadioButton;
class QComboBox;
@@ -110,7 +109,6 @@ private slots:
void proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode *pro);
void setArguments(const QString &argumentsString);
void setWorkingDirectory(const QString &workingDirectory);
- void setUserName(const QString&);
void setRunMode(RunMode runMode);
protected:
@@ -121,7 +119,7 @@ private:
enum BaseEnvironmentBase { CleanEnvironmentBase = 0,
SystemEnvironmentBase = 1,
BuildEnvironmentBase = 2 };
- void setDefaultDisplayName();
+ QString defaultDisplayName();
void setBaseEnvironmentBase(BaseEnvironmentBase env);
BaseEnvironmentBase baseEnvironmentBase() const;
@@ -161,12 +159,10 @@ private slots:
void workDirectoryEdited();
void workingDirectoryReseted();
void argumentsEdited(const QString &arguments);
- void displayNameEdited(const QString &name);
void userChangesEdited();
void workingDirectoryChanged(const QString &workingDirectory);
void commandLineArgumentsChanged(const QString &args);
- void displayNameChanged();
void runModeChanged(ProjectExplorer::LocalApplicationRunConfiguration::RunMode runMode);
void userEnvironmentChangesChanged(const QList<ProjectExplorer::EnvironmentItem> &userChanges);
void baseEnvironmentChanged();
@@ -180,9 +176,8 @@ private slots:
private:
Qt4RunConfiguration *m_qt4RunConfiguration;
bool m_ignoreChange;
- QLabel *m_executableLabel;
+ QLineEdit *m_executableLineEdit;
Utils::PathChooser *m_workingDirectoryEdit;
- QLineEdit *m_nameLineEdit;
QLineEdit *m_argumentsLineEdit;
QCheckBox *m_useTerminalCheck;
QCheckBox *m_usingDyldImageSuffix;