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

don't validate executable paths & working dirs in build & run configs

Browse Source 
it's well within expectations that they do not exist at the time of
configuration (especially when shadow building).
additionally, keeping the validation info (macros and environment)
up-to-date would require a notification infrastructure which is just not
worth the effort.
This commit is contained in:
Oswald Buddenhagen
2011-03-08 18:26:15 +01:00
parent 0b20199a92
commit 64cfa4615d
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -333,9 +333,9 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *
fl->addRow(tr("Arguments:"), argumentsLineEdit); fl->addRow(tr("Arguments:"), argumentsLineEdit);
m_workingDirectoryEdit = new Utils::PathChooser(); m_workingDirectoryEdit = new Utils::PathChooser();
m_workingDirectoryEdit->setExpectedKind(Utils::PathChooser::Directory);
m_workingDirectoryEdit->setBaseDirectory(m_cmakeRunConfiguration->target()->project()->projectDirectory()); m_workingDirectoryEdit->setBaseDirectory(m_cmakeRunConfiguration->target()->project()->projectDirectory());
m_workingDirectoryEdit->setPath(m_cmakeRunConfiguration->baseWorkingDirectory()); m_workingDirectoryEdit->setPath(m_cmakeRunConfiguration->baseWorkingDirectory());
m_workingDirectoryEdit->setExpectedKind(Utils::PathChooser::ExistingDirectory);
m_workingDirectoryEdit->setPromptDialogTitle(tr("Select Working Directory")); m_workingDirectoryEdit->setPromptDialogTitle(tr("Select Working Directory"));
QToolButton *resetButton = new QToolButton(); QToolButton *resetButton = new QToolButton();

2
src/plugins/projectexplorer/customexecutableconfigurationwidget.cpp
View File

@@ -62,8 +62,8 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE
layout->setMargin(0); layout->setMargin(0);
m_executableChooser = new Utils::PathChooser(this); m_executableChooser = new Utils::PathChooser(this);
m_executableChooser->setEnvironment(rc->environment());
m_executableChooser->setExpectedKind(Utils::PathChooser::Command); m_executableChooser->setExpectedKind(Utils::PathChooser::Command);
m_executableChooser->setEnvironment(rc->environment());
layout->addRow(tr("Executable:"), m_executableChooser); layout->addRow(tr("Executable:"), m_executableChooser);
m_commandLineArgumentsLineEdit = new QLineEdit(this); m_commandLineArgumentsLineEdit = new QLineEdit(this);

2
src/plugins/projectexplorer/processstep.cpp
View File

@@ -258,7 +258,7 @@ ProcessStepConfigWidget::ProcessStepConfigWidget(ProcessStep *step)
: m_step(step) : m_step(step)
{ {
m_ui.setupUi(this); m_ui.setupUi(this);
m_ui.command->setExpectedKind(Utils::PathChooser::ExistingCommand); m_ui.command->setExpectedKind(Utils::PathChooser::Command);
connect(m_ui.command, SIGNAL(changed(QString)), connect(m_ui.command, SIGNAL(changed(QString)),
this, SLOT(commandLineEditTextEdited())); this, SLOT(commandLineEditTextEdited()));
connect(m_ui.workingDirectory, SIGNAL(changed(QString)), connect(m_ui.workingDirectory, SIGNAL(changed(QString)),

2
src/plugins/projectexplorer/toolchainconfigwidget.cpp
View File

@@ -111,9 +111,9 @@ void ToolChainConfigWidget::ensureDebuggerPathChooser(const QStringList &version
if (m_d->m_debuggerPathChooser) if (m_d->m_debuggerPathChooser)
return; return;
m_d->m_debuggerPathChooser = new Utils::PathChooser; m_d->m_debuggerPathChooser = new Utils::PathChooser;
m_d->m_debuggerPathChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
if (!versionArguments.isEmpty()) if (!versionArguments.isEmpty())
m_d->m_debuggerPathChooser->setCommandVersionArguments(versionArguments); m_d->m_debuggerPathChooser->setCommandVersionArguments(versionArguments);
m_d->m_debuggerPathChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
connect(m_d->m_debuggerPathChooser, SIGNAL(changed(QString)), this, SLOT(emitDirty())); connect(m_d->m_debuggerPathChooser, SIGNAL(changed(QString)), this, SLOT(emitDirty()));
} }

2
src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
View File

@@ -214,9 +214,9 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
toplayout->addRow(argumentsLabel, m_argumentsLineEdit); toplayout->addRow(argumentsLabel, m_argumentsLineEdit);
m_workingDirectoryEdit = new Utils::PathChooser(this); m_workingDirectoryEdit = new Utils::PathChooser(this);
m_workingDirectoryEdit->setExpectedKind(Utils::PathChooser::Directory);
m_workingDirectoryEdit->setPath(m_qt4RunConfiguration->baseWorkingDirectory()); m_workingDirectoryEdit->setPath(m_qt4RunConfiguration->baseWorkingDirectory());
m_workingDirectoryEdit->setBaseDirectory(m_qt4RunConfiguration->target()->project()->projectDirectory()); m_workingDirectoryEdit->setBaseDirectory(m_qt4RunConfiguration->target()->project()->projectDirectory());
m_workingDirectoryEdit->setExpectedKind(Utils::PathChooser::ExistingDirectory);
m_workingDirectoryEdit->setEnvironment(m_qt4RunConfiguration->environment()); m_workingDirectoryEdit->setEnvironment(m_qt4RunConfiguration->environment());
m_workingDirectoryEdit->setPromptDialogTitle(tr("Select Working Directory")); m_workingDirectoryEdit->setPromptDialogTitle(tr("Select Working Directory"));